diff options
899 files changed, 9632 insertions, 5433 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4d3c8888f3a..fa1140a7e33 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,33 +7,38 @@ assignees: '' --- -**Describe the bug** +### Describe the bug A clear and concise description of what the bug is. -**To Reproduce** +### Steps To Reproduce Steps to reproduce the behavior: 1. ... 2. ... 3. ... -**Expected behavior** +### Expected behavior A clear and concise description of what you expected to happen. -**Screenshots** +### Screenshots If applicable, add screenshots to help explain your problem. -**Additional context** +### Additional context Add any other context about the problem here. -**Notify maintainers** +### Notify maintainers <!-- Please @ people who are in the `meta.maintainers` list of the offending package or module. If in doubt, check `git blame` for whoever last touched something. --> -**Metadata** +### Metadata Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. +```console +[user@system:~]$ nix-shell -p nix-info --run "nix-info -m" +output here +``` + Maintainer information: ```yaml # a list of nixpkgs attributes affected by the problem diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml new file mode 100644 index 00000000000..fb9a95851f0 --- /dev/null +++ b/.github/workflows/no-channel.yml @@ -0,0 +1,21 @@ +name: "No channel PR" + +on: + pull_request: + branches: + - 'nixos-**' + - 'nixpkgs-**' + +jobs: + fail: + name: "This PR is is targeting a channel branch" + runs-on: ubuntu-latest + steps: + - run: | + cat <<EOF + The nixos-* and nixpkgs-* branches are pushed to by the channel + release script and should not be merged into directly. + + Please target the equivalent release-* branch or master instead. + EOF + exit 1 diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index e170591605c..26a01a89aa5 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -120,7 +120,7 @@ After that you can install your special grafted `myVim` or `myNeovim` packages. If one of your favourite plugins isn't packaged, you can package it yourself: -``` +```nix { config, pkgs, ... }: let @@ -154,6 +154,33 @@ in } ``` +### Specificities for some plugins +#### Tree sitter + +By default `nvim-treesitter` encourages you to download, compile and install +the required tree-sitter grammars at run time with `:TSInstall`. This works +poorly on NixOS. Instead, to install the `nvim-treesitter` plugins with a set +of precompiled grammars, you can use `nvim-treesitter.withPlugins` function: + +```nix +(pkgs.neovim.override { + configure = { + packages.myPlugins = with pkgs.vimPlugins; { + start = [ + (nvim-treesitter.withPlugins ( + plugins: with plugins; [ + tree-sitter-nix + tree-sitter-python + ] + )) + ]; + }; + }; +}) +``` + +To enable all grammars packaged in nixpkgs, use `(pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))`. + ## Managing plugins with vim-plug {#managing-plugins-with-vim-plug} To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ba85483ccd..f6bc656610f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -802,6 +802,12 @@ githubId = 13426784; name = "arcnmx"; }; + arcticlimer = { + email = "vinigm.nho@gmail.com"; + github = "arcticlimer"; + githubId = 59743220; + name = "VinÃcius Müller"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1054,6 +1060,12 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + arjix = { + email = "arjix@protonmail.com"; + github = "arjix"; + githubId = 62168569; + name = "arjix"; + }; artturin = { email = "artturin@artturin.com"; github = "artturin"; @@ -2469,6 +2481,12 @@ githubId = 452652; name = "Kosyrev Serge"; }; + DeeUnderscore = { + email = "d.anzorge@gmail.com"; + github = "DeeUnderscore"; + githubId = 156239; + name = "D Anzorge"; + }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; @@ -4213,6 +4231,12 @@ githubId = 6430643; name = "Henry Till"; }; + heph2 = { + email = "srht@mrkeebs.eu"; + github = "heph2"; + githubId = 87579883; + name = "Marco"; + }; herberteuler = { email = "herberteuler@gmail.com"; github = "herberteuler"; @@ -4337,6 +4361,12 @@ github = "HolgerPeters"; githubId = 4097049; }; + hqurve = { + email = "hqurve@outlook.com"; + github = "hqurve"; + githubId = 53281855; + name = "hqurve"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -4793,6 +4823,12 @@ githubId = 1383440; name = "Jason Gilliland"; }; + jdahm = { + email = "johann.dahm@gmail.com"; + github = "jdahm"; + githubId = 68032; + name = "Johann Dahm"; + }; jdanek = { email = "jdanek@redhat.com"; github = "jdanekrh"; @@ -5490,6 +5526,12 @@ githubId = 25607; name = "Raimon Grau"; }; + kidonng = { + email = "hi@xuann.wang"; + github = "kidonng"; + githubId = 44045911; + name = "Kid"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -6616,6 +6658,12 @@ githubId = 1191859; name = "Maxim Krivchikov"; }; + MayNiklas = { + email = "info@niklas-steffen.de"; + github = "MayNiklas"; + githubId = 44636701; + name = "Niklas Steffen"; + }; mazurel = { email = "mateusz.mazur@yahoo.com"; github = "Mazurel"; @@ -7582,6 +7630,12 @@ githubId = 26231126; name = "Nils ANDRÉ-CHANG"; }; + nils-degroot = { + email = "nils@peeko.nl"; + github = "nils-degroot"; + githubId = 53556985; + name = "Nils de Groot"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; @@ -11326,6 +11380,12 @@ githubId = 19174984; name = "Alex Whitt"; }; + whonore = { + email = "wolfhonore@gmail.com"; + github = "whonore"; + githubId = 7121530; + name = "Wolf Honoré"; + }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 59696a4432d..6a08eb88bf8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -165,6 +165,20 @@ elsif (defined $expr) { my $hash = $fetch->{hash}; my $name = $fetch->{name}; + if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { + $algo = $1; + $hash = `nix hash to-base16 $hash` or die; + chomp $hash; + } + + next unless $algo =~ /^[a-z0-9]+$/; + + # Convert non-SRI base-64 to base-16. + if ($hash =~ /^[A-Za-z0-9+\/=]+$/) { + $hash = `nix hash to-base16 --type '$algo' $hash` or die; + chomp $hash; + } + if (defined $ENV{DEBUG}) { print "$url $algo $hash\n"; next; @@ -184,7 +198,7 @@ elsif (defined $expr) { my $storePath = makeFixedOutputPath(0, $algo, $hash, $name); - print STDERR "mirroring $url ($storePath)...\n"; + print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; if ($dryRun) { $mirrored++; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 73f6843b8a7..3695997f717 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -48,6 +48,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/xrelkd/clipcat/">clipcat</link>, + an X11 clipboard manager written in Rust. Available at + [services.clipcat](options.html#o pt-services.clipcat.enable). + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://github.com/maxmind/geoipupdate">geoipupdate</link>, a GeoIP database updater from MaxMind. Available as <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>. @@ -105,6 +112,14 @@ <link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/buildkite/buildkite-agent-metrics">buildkite-agent-metrics</link>, + a command-line tool for collecting Buildkite agent metrics, + now has a Prometheus exporter available as + <link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> @@ -529,6 +544,12 @@ 2020 to 2021 </para> </listitem> + <listitem> + <para> + the <literal>mingw-64</literal> package has been upgraded from + 6.0.0 to 9.0.0 + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> @@ -596,6 +617,77 @@ be removed in 22.05. </para> </listitem> + <listitem> + <para> + The order of NSS (host) modules has been brought in line with + upstream recommendations: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + The <literal>myhostname</literal> module is placed before + the <literal>resolve</literal> (optional) and + <literal>dns</literal> entries, but after + <literal>file</literal> (to allow overriding via + <literal>/etc/hosts</literal> / + <literal>networking.extraHosts</literal>, and prevent ISPs + with catchall-DNS resolvers from hijacking + <literal>.localhost</literal> domains) + </para> + </listitem> + <listitem> + <para> + The <literal>mymachines</literal> module, which provides + hostname resolution for local containers (registered with + <literal>systemd-machined</literal>) is placed to the + front, to make sure its mappings are preferred over other + resolvers. + </para> + </listitem> + <listitem> + <para> + If systemd-networkd is enabled, the + <literal>resolve</literal> module is placed before + <literal>files</literal> and + <literal>myhostname</literal>, as it provides the same + logic internally, with caching. + </para> + </listitem> + <listitem> + <para> + The <literal>mdns(_minimal)</literal> module has been + updated to the new priorities. + </para> + </listitem> + </itemizedlist> + <para> + If you use your own NSS host modules, make sure to update your + priorities according to these rules: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + NSS modules which should be queried before + <literal>resolved</literal> DNS resolution should use + mkBefore. + </para> + </listitem> + <listitem> + <para> + NSS modules which should be queried after + <literal>resolved</literal>, <literal>files</literal> and + <literal>myhostname</literal>, but before + <literal>dns</literal> should use the default priority + </para> + </listitem> + <listitem> + <para> + NSS modules which should come after <literal>dns</literal> + should use mkAfter. + </para> + </listitem> + </itemizedlist> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index ce13eb7c47b..cc5b6bf81ee 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -15,6 +15,9 @@ In addition to numerous new and upgraded packages, this release has the followin - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). +- [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#o +pt-services.clipcat.enable). + - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea). @@ -32,6 +35,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [Hockeypuck](https://github.com/hockeypuck/hockeypuck), a OpenPGP Key Server. Available as [services.hockeypuck](#opt-services.hockeypuck.enable). +- [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable). ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} @@ -134,6 +138,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `isabelle` package has been upgraded from 2020 to 2021 +- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. @@ -149,3 +155,27 @@ In addition to numerous new and upgraded packages, this release has the followin - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. + +- The order of NSS (host) modules has been brought in line with upstream + recommendations: + + - The `myhostname` module is placed before the `resolve` (optional) and `dns` + entries, but after `file` (to allow overriding via `/etc/hosts` / + `networking.extraHosts`, and prevent ISPs with catchall-DNS resolvers from + hijacking `.localhost` domains) + - The `mymachines` module, which provides hostname resolution for local + containers (registered with `systemd-machined`) is placed to the front, to + make sure its mappings are preferred over other resolvers. + - If systemd-networkd is enabled, the `resolve` module is placed before + `files` and `myhostname`, as it provides the same logic internally, with + caching. + - The `mdns(_minimal)` module has been updated to the new priorities. + + If you use your own NSS host modules, make sure to update your priorities + according to these rules: + + - NSS modules which should be queried before `resolved` DNS resolution should + use mkBefore. + - NSS modules which should be queried after `resolved`, `files` and + `myhostname`, but before `dns` should use the default priority + - NSS modules which should come after `dns` should use mkAfter. diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 15eaba88476..2a3e4d94b94 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -499,7 +499,7 @@ class Machine: output += out return output - def wait_until_succeeds(self, command: str) -> str: + def wait_until_succeeds(self, command: str, timeout: int = 900) -> str: """Wait until a command returns success and return its output. Throws an exception on timeout. """ @@ -511,7 +511,7 @@ class Machine: return status == 0 with self.nested("waiting for success: {}".format(command)): - retry(check_success) + retry(check_success, timeout) return output def wait_until_fails(self, command: str) -> str: diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index d19d35a4890..91a36cef10e 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -124,8 +124,8 @@ with lib; group = mkBefore [ "files" ]; shadow = mkBefore [ "files" ]; hosts = mkMerge [ - (mkBefore [ "files" ]) - (mkAfter [ "dns" ]) + (mkOrder 998 [ "files" ]) + (mkOrder 1499 [ "dns" ]) ]; services = mkBefore [ "files" ]; }; diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix index 4c359c3b172..8b3ba87a7d9 100644 --- a/nixos/modules/hardware/sensor/iio.nix +++ b/nixos/modules/hardware/sensor/iio.nix @@ -9,7 +9,7 @@ with lib; hardware.sensor.iio = { enable = mkOption { description = '' - Enable this option to support IIO sensors. + Enable this option to support IIO sensors with iio-sensor-proxy. IIO sensors are used for orientation and ambient light sensors on some mobile devices. diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 801e28cec44..e3576074a5b 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,7 @@ { - x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; - i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; - aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; - x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; + x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14"; + i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14"; + aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14"; + x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14"; + aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14"; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 13463359a66..4d1700ed99a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -475,6 +475,7 @@ ./services/misc/calibre-server.nix ./services/misc/cfdyndns.nix ./services/misc/clipmenu.nix + ./services/misc/clipcat.nix ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix index ba5670f9dfe..25975d88ec8 100644 --- a/nixos/modules/programs/udevil.nix +++ b/nixos/modules/programs/udevil.nix @@ -10,5 +10,8 @@ in { config = mkIf cfg.enable { security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + + systemd.packages = [ pkgs.udevil ]; + systemd.services."devmon@".wantedBy = [ "multi-user.target" ]; }; } diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 48638fda28d..6c824a692b7 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -53,7 +53,7 @@ in }; shellAliases = mkOption { - default = {}; + default = { }; description = '' Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>. See <option>environment.shellAliases</option> for an option format description. @@ -118,7 +118,9 @@ in setOptions = mkOption { type = types.listOf types.str; default = [ - "HIST_IGNORE_DUPS" "SHARE_HISTORY" "HIST_FCNTL_LOCK" + "HIST_IGNORE_DUPS" + "SHARE_HISTORY" + "HIST_FCNTL_LOCK" ]; example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ]; description = '' @@ -278,15 +280,29 @@ in environment.etc.zinputrc.source = ./zinputrc; - environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + environment.systemPackages = + let + completions = + if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre" + then + pkgs.nix-zsh-completions.overrideAttrs + (_: { + postInstall = '' + rm $out/share/zsh/site-functions/_nix + ''; + }) + else pkgs.nix-zsh-completions; + in + [ pkgs.zsh ] + ++ optional cfg.enableCompletion completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = - [ "/run/current-system/sw/bin/zsh" + [ + "/run/current-system/sw/bin/zsh" "${pkgs.zsh}/bin/zsh" ]; diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index be44a43b6d3..abc4def1c61 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -108,8 +108,8 @@ in { type = types.attrsOf (types.submodule ({config, options, ...}: { freeformType = datasetSettingsType; options = commonOptions // datasetOptions; - config.use_template = mkAliasDefinitions (options.useTemplate or {}); - config.process_children_only = mkAliasDefinitions (options.processChildrenOnly or {}); + config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or {}); + config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or {}); })); default = {}; description = "Datasets to snapshot."; diff --git a/nixos/modules/services/misc/clipcat.nix b/nixos/modules/services/misc/clipcat.nix new file mode 100644 index 00000000000..128bb9a89d6 --- /dev/null +++ b/nixos/modules/services/misc/clipcat.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.clipcat; +in { + + options.services.clipcat= { + enable = mkEnableOption "Clipcat clipboard daemon"; + + package = mkOption { + type = types.package; + default = pkgs.clipcat; + defaultText = "pkgs.clipcat"; + description = "clipcat derivation to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.clipcat = { + enable = true; + description = "clipcat daemon"; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${cfg.package}/bin/clipcatd --no-daemon"; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index d68d7b05c17..dcd825bba43 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -313,6 +313,7 @@ in { "w800rf32" "xbee" "zha" + "zwave" ]; in { ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'"; diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 2f04c011a65..4930648ba8e 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -2,7 +2,6 @@ with lib; let cfg = config.services.klipper; - package = pkgs.klipper; format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; }; in { @@ -11,12 +10,51 @@ in services.klipper = { enable = mkEnableOption "Klipper, the 3D printer firmware"; + package = mkOption { + type = types.package; + default = pkgs.klipper; + description = "The Klipper package."; + }; + + inputTTY = mkOption { + type = types.path; + default = "/run/klipper/tty"; + description = "Path of the virtual printer symlink to create."; + }; + + apiSocket = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/klipper/api"; + description = "Path of the API socket to create."; + }; + octoprintIntegration = mkOption { type = types.bool; default = false; description = "Allows Octoprint to control Klipper."; }; + user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User account under which Klipper runs. + + If null is specified (default), a temporary user will be created by systemd. + ''; + }; + + group = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Group account under which Klipper runs. + + If null is specified (default), a temporary user will be created by systemd. + ''; + }; + settings = mkOption { type = format.type; default = { }; @@ -30,26 +68,40 @@ in ##### implementation config = mkIf cfg.enable { - assertions = [{ - assertion = cfg.octoprintIntegration -> config.services.octoprint.enable; - message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it."; - }]; + assertions = [ + { + assertion = cfg.octoprintIntegration -> config.services.octoprint.enable; + message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it."; + } + { + assertion = cfg.user != null -> cfg.group != null; + message = "Option klipper.group is not set when a user is specified."; + } + ]; environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings; - systemd.services.klipper = { + services.klipper = mkIf cfg.octoprintIntegration { + user = config.services.octoprint.user; + group = config.services.octoprint.group; + }; + + systemd.services.klipper = let + klippyArgs = "--input-tty=${cfg.inputTTY}" + + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"; + in { description = "Klipper 3D Printer Firmware"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${package}/lib/klipper/klippy.py --input-tty=/run/klipper/tty /etc/klipper.cfg"; + ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg"; RuntimeDirectory = "klipper"; SupplementaryGroups = [ "dialout" ]; - WorkingDirectory = "${package}/lib"; - } // (if cfg.octoprintIntegration then { - Group = config.services.octoprint.group; - User = config.services.octoprint.user; + WorkingDirectory = "${cfg.package}/lib"; + } // (if cfg.user != null then { + Group = cfg.group; + User = cfg.user; } else { DynamicUser = true; User = "klipper"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 6bd075697fa..d648de6a414 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -27,6 +27,7 @@ let "bird" "bitcoin" "blackbox" + "buildkite-agent" "collectd" "dnsmasq" "domain" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix b/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix new file mode 100644 index 00000000000..7557480ac06 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.buildkite-agent; +in +{ + port = 9876; + extraOpts = { + tokenPath = mkOption { + type = types.nullOr types.path; + apply = final: if final == null then null else toString final; + description = '' + The token from your Buildkite "Agents" page. + + A run-time path to the token file, which is supposed to be provisioned + outside of Nix store. + ''; + }; + interval = mkOption { + type = types.str; + default = "30s"; + example = "1min"; + description = '' + How often to update metrics. + ''; + }; + endpoint = mkOption { + type = types.str; + default = "https://agent.buildkite.com/v3"; + description = '' + The Buildkite Agent API endpoint. + ''; + }; + queues = mkOption { + type = with types; nullOr (listOf str); + default = null; + example = literalExample ''[ "my-queue1" "my-queue2" ]''; + description = '' + Which specific queues to process. + ''; + }; + }; + serviceOpts = { + script = + let + queues = concatStringsSep " " (map (q: "-queue ${q}") cfg.queues); + in + '' + export BUILDKITE_AGENT_TOKEN="$(cat ${toString cfg.tokenPath})" + exec ${pkgs.buildkite-agent-metrics}/bin/buildkite-agent-metrics \ + -backend prometheus \ + -interval ${cfg.interval} \ + -endpoint ${cfg.endpoint} \ + ${optionalString (cfg.queues != null) queues} \ + -prometheus-addr "${cfg.listenAddress}:${toString cfg.port}" ${concatStringsSep " " cfg.extraFlags} + ''; + serviceConfig = { + DynamicUser = false; + RuntimeDirectory = "buildkite-agent-metrics"; + }; + }; +} diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 0b7d5575c11..020a817f259 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -240,8 +240,8 @@ in system.nssModules = optional cfg.nssmdns pkgs.nssmdns; system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [ - (mkOrder 900 [ "mdns_minimal [NOTFOUND=return]" ]) # must be before resolve - (mkOrder 1501 [ "mdns" ]) # 1501 to ensure it's after dns + (mkBefore [ "mdns_minimal [NOTFOUND=return]" ]) # before resolve + (mkAfter [ "mdns" ]) # after dns ]); environment.systemPackages = [ pkgs.avahi ]; diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index 4acdd1d69cc..e76ba9a2d00 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -37,7 +37,7 @@ in { } ''; description = '' - Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/master/internal/config/default.toml"/> + Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/main/internal/config/reference.toml"/> for supported values. Ignored if configFile is set. ''; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 064018057cd..4be9fc952a8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -49,6 +49,7 @@ let rc-manager = if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"; + firewall-backend = cfg.firewallBackend; }) (mkSection "keyfile" { unmanaged-devices = @@ -244,6 +245,15 @@ in { ''; }; + firewallBackend = mkOption { + type = types.enum [ "iptables" "nftables" "none" ]; + default = "iptables"; + description = '' + Which firewall backend should be used for configuring masquerading with shared mode. + If set to none, NetworkManager doesn't manage the configuration at all. + ''; + }; + logLevel = mkOption { type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ]; default = "WARN"; diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index cb75142965e..72f37c32253 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -103,6 +103,7 @@ in }]; boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; + networking.networkmanager.firewallBackend = mkDefault "nftables"; systemd.services.nftables = { description = "nftables firewall"; before = [ "network-pre.target" ]; diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix index c1cbdb46176..37f44f07ac4 100644 --- a/nixos/modules/services/networking/pppd.nix +++ b/nixos/modules/services/networking/pppd.nix @@ -82,13 +82,21 @@ in LD_PRELOAD = "${pkgs.libredirect}/lib/libredirect.so"; NIX_REDIRECTS = "/var/run=/run/pppd"; }; - serviceConfig = { + serviceConfig = let + capabilities = [ + "CAP_BPF" + "CAP_SYS_TTY_CONFIG" + "CAP_NET_ADMIN" + "CAP_NET_RAW" + ]; + in + { ExecStart = "${getBin cfg.package}/sbin/pppd call ${peerCfg.name} nodetach nolog"; Restart = "always"; RestartSec = 5; - AmbientCapabilities = "CAP_SYS_TTY_CONFIG CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN"; - CapabilityBoundingSet = "CAP_SYS_TTY_CONFIG CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN"; + AmbientCapabilities = capabilities; + CapabilityBoundingSet = capabilities; KeyringMode = "private"; LockPersonality = true; MemoryDenyWriteExecute = true; @@ -103,7 +111,17 @@ in ProtectKernelTunables = false; ProtectSystem = "strict"; RemoveIPC = true; - RestrictAddressFamilies = "AF_PACKET AF_UNIX AF_PPPOX AF_ATMPVC AF_ATMSVC AF_INET AF_INET6 AF_IPX"; + RestrictAddressFamilies = [ + "AF_ATMPVC" + "AF_ATMSVC" + "AF_INET" + "AF_INET6" + "AF_IPX" + "AF_NETLINK" + "AF_PACKET" + "AF_PPPOX" + "AF_UNIX" + ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 09aef9a1dcf..6d7178047ea 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -21,7 +21,15 @@ let )) else throw (traceSeq v "services.unbound.settings: unexpected type"); - confFile = pkgs.writeText "unbound.conf" (concatStringsSep "\n" ((mapAttrsToList (toConf "") cfg.settings) ++ [""])); + confNoServer = concatStringsSep "\n" ((mapAttrsToList (toConf "") (builtins.removeAttrs cfg.settings [ "server" ])) ++ [""]); + confServer = concatStringsSep "\n" (mapAttrsToList (toConf " ") (builtins.removeAttrs cfg.settings.server [ "define-tag" ])); + + confFile = pkgs.writeText "unbound.conf" '' + server: + ${optionalString (cfg.settings.server.define-tag != "") (toOption " " "define-tag" cfg.settings.server.define-tag)} + ${confServer} + ${confNoServer} + ''; rootTrustAnchorFile = "${cfg.stateDir}/root.key"; @@ -170,6 +178,7 @@ in { # prevent race conditions on system startup when interfaces are not yet # configured ip-freebind = mkDefault true; + define-tag = mkDefault ""; }; remote-control = { control-enable = mkDefault false; diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 8345dfabeb7..7cf2ff87da2 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -6,7 +6,7 @@ let cfg = config.services.getty; baseArgs = [ - "--login-program" "${pkgs.shadow}/bin/login" + "--login-program" "${cfg.loginProgram}" ] ++ optionals (cfg.autologinUser != null) [ "--autologin" cfg.autologinUser ] ++ optionals (cfg.loginOptions != null) [ @@ -39,6 +39,14 @@ in ''; }; + loginProgram = mkOption { + type = types.path; + default = "${pkgs.shadow}/bin/login"; + description = '' + Path to the login binary executed by agetty. + ''; + }; + loginOptions = mkOption { type = types.nullOr types.str; default = null; diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index caf5ba466df..b56848b79d2 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -7,10 +7,15 @@ let # FIXME consider using LoadCredential as soon as it actually works. envSecrets = '' - export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})" - export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})" + ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})" + export ADMIN_USER_PWD # separate export to make `set -e` work + + SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})" + export SECRET_KEY_BASE # separate export to make `set -e` work + ${optionalString (cfg.mail.smtp.passwordFile != null) '' - export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})" + SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})" + export SMTP_USER_PWD # separate export to make `set -e` work ''} ''; in { @@ -102,6 +107,11 @@ in { type = types.str; description = '' Public URL where plausible is available. + + Note that <literal>/path</literal> components are currently ignored: + <link xlink:href="https://github.com/plausible/analytics/issues/1182"> + https://github.com/plausible/analytics/issues/1182 + </link>. ''; }; }; @@ -228,6 +238,7 @@ in { WorkingDirectory = "/var/lib/plausible"; StateDirectory = "plausible"; ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" '' + set -eu -o pipefail ${envSecrets} ${pkgs.plausible}/createdb.sh ${pkgs.plausible}/migrate.sh @@ -238,6 +249,7 @@ in { ''} ''} plausible-setup"; ExecStart = "@${pkgs.writeShellScript "plausible" '' + set -eu -o pipefail ${envSecrets} plausible start ''} plausible"; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 84bc9b78076..a6fc07da0ab 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -140,7 +140,8 @@ in # add resolve to nss hosts database if enabled and nscd enabled # system.nssModules is configured in nixos/modules/system/boot/systemd.nix - system.nssDatabases.hosts = optional config.services.nscd.enable "resolve [!UNAVAIL=return]"; + # added with order 501 to allow modules to go before with mkBefore + system.nssDatabases.hosts = (mkOrder 501 ["resolve [!UNAVAIL=return]"]); systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index abd8ab29cae..58064e5de86 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -925,9 +925,8 @@ in system.nssModules = [ systemd.out ]; system.nssDatabases = { hosts = (mkMerge [ - [ "mymachines" ] - (mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last - ) + (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd) + (mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules ]); passwd = (mkMerge [ (mkAfter [ "systemd" ]) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 8d352e36ef9..c135081959a 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,6 +6,9 @@ let crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); + format = pkgs.formats.toml { }; + + cfgFile = format.generate "00-default.conf" cfg.settings; in { imports = [ @@ -13,7 +16,7 @@ in ]; meta = { - maintainers = lib.teams.podman.members; + maintainers = teams.podman.members; }; options.virtualisation.cri-o = { @@ -55,7 +58,7 @@ in extraPackages = mkOption { type = with types; listOf package; default = [ ]; - example = lib.literalExample '' + example = literalExample '' [ pkgs.gvisor ] @@ -65,7 +68,7 @@ in ''; }; - package = lib.mkOption { + package = mkOption { type = types.package; default = crioPackage; internal = true; @@ -80,6 +83,15 @@ in description = "Override the network_dir option."; internal = true; }; + + settings = mkOption { + type = format.type; + default = { }; + description = '' + Configuration for cri-o, see + <link xlink:href="https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md"/>. + ''; + }; }; config = mkIf cfg.enable { @@ -87,36 +99,38 @@ in 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] - storage_driver = "${cfg.storageDriver}" - - [crio.image] - ${optionalString (cfg.pauseImage != null) ''pause_image = "${cfg.pauseImage}"''} - ${optionalString (cfg.pauseCommand != null) ''pause_command = "${cfg.pauseCommand}"''} - - [crio.network] - plugin_dirs = ["${pkgs.cni-plugins}/bin/"] - ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''} - - [crio.runtime] - cgroup_manager = "systemd" - log_level = "${cfg.logLevel}" - pinns_path = "${cfg.package}/bin/pinns" - hooks_dir = [ - ${lib.optionalString config.virtualisation.containers.ociSeccompBpfHook.enable - ''"${config.boot.kernelPackages.oci-seccomp-bpf-hook}",''} - ] - - ${optionalString (cfg.runtime != null) '' - default_runtime = "${cfg.runtime}" - [crio.runtime.runtimes] - [crio.runtime.runtimes.${cfg.runtime}] - ''} - ''; + virtualisation.cri-o.settings.crio = { + storage_driver = cfg.storageDriver; + + image = { + pause_image = mkIf (cfg.pauseImage != null) cfg.pauseImage; + pause_command = mkIf (cfg.pauseCommand != null) cfg.pauseCommand; + }; + + network = { + plugin_dirs = [ "${pkgs.cni-plugins}/bin" ]; + network_dir = mkIf (cfg.networkDir != null) cfg.networkDir; + }; + + runtime = { + cgroup_manager = "systemd"; + log_level = cfg.logLevel; + manage_ns_lifecycle = true; + pinns_path = "${cfg.package}/bin/pinns"; + hooks_dir = + optional (config.virtualisation.containers.ociSeccompBpfHook.enable) + config.boot.kernelPackages.oci-seccomp-bpf-hook; + + default_runtime = mkIf (cfg.runtime != null) cfg.runtime; + runtimes = mkIf (cfg.runtime != null) { + "${cfg.runtime}" = { }; + }; + }; + }; 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"; + environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile; # Enable common /etc/containers configuration virtualisation.containers.enable = true; @@ -139,6 +153,7 @@ in TimeoutStartSec = "0"; Restart = "on-abnormal"; }; + restartTriggers = [ cfgFile ]; }; }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 770aff2abbd..071a8175b4d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -425,6 +425,7 @@ in taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; + tigervnc = handleTest ./tigervnc.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index d2a8f276f12..c4ad73679b7 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -81,7 +81,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { # Add optional CLI options: options = [] major_version = "${versions.major (getVersion chromiumPkg.name)}" - if major_version > "91": + if major_version > "91" and pname.startswith("google-chrome"): # To avoid a GPU crash: options += ["--use-gl=angle", "--use-angle=swiftshader"] options.append("file://${startupHTML}") diff --git a/nixos/tests/tigervnc.nix b/nixos/tests/tigervnc.nix new file mode 100644 index 00000000000..c0a52808b27 --- /dev/null +++ b/nixos/tests/tigervnc.nix @@ -0,0 +1,53 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +makeTest { + name = "tigervnc"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lheckemann ]; + }; + + nodes = { + server = { pkgs, ...}: { + environment.systemPackages = with pkgs; [ + tigervnc # for Xvnc + xorg.xwininfo + imagemagickBig # for display with working label: support + ]; + networking.firewall.allowedTCPPorts = [ 5901 ]; + }; + + client = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + # for vncviewer + environment.systemPackages = [ pkgs.tigervnc ]; + }; + }; + + enableOCR = true; + + testScript = '' + start_all() + + for host in [server, client]: + host.succeed("echo foobar | vncpasswd -f > vncpasswd") + + server.succeed("Xvnc -geometry 720x576 :1 -PasswordFile vncpasswd &") + server.wait_until_succeeds("nc -z localhost 5901", timeout=10) + server.succeed("DISPLAY=:1 xwininfo -root | grep 720x576") + server.execute("DISPLAY=:1 display -size 360x200 -font sans -gravity south label:'HELLO VNC WORLD' &") + + client.wait_for_x() + client.execute("vncviewer server:1 -PasswordFile vncpasswd &") + client.wait_for_window(r"VNC") + client.screenshot("screenshot") + text = client.get_screen_text() + # Displayed text + assert 'HELLO VNC WORLD' in text + # Client window title + assert 'TigerVNC' in text + ''; +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index b6dea53012d..49205439670 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063"; + sha256 = "sha256-yhCAKlbLjyBywkSYY1aqbUGFlAHBLR8g8xPDIqoUIZk="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index dbf895ed02c..029710206f0 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.16.0"; + version = "6.16.2"; hardeningDisable = [ "format" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-1+P2W8auc34sNJdKHUcilOBCK+Is9GHnM+J+M4oNR3U="; + sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 3d4e5e5e5b9..97870c478eb 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -47,8 +47,6 @@ in mkDerivation rec { substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; ''; - enableParallelBuilding = true; - meta = with lib; { description = "Analyse and compare audio files in time and frequency"; longDescription = '' diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 967c984bc50..7e376c89d36 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -38,8 +38,6 @@ mkDerivation rec { PREFIXSHORTCUT=$out" ''; - enableParallelBuilding = true; - meta = { description = "Free Musical Instrument Tuner"; longDescription = '' diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 2551c610c57..a0443aa9a6a 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -3,6 +3,7 @@ , autoPatchelfHook , fetchurl , flac +, gcc11 , lib , libmicrohttpd , llvmPackages_10 @@ -17,13 +18,11 @@ mkDerivation rec { pname = "hqplayer-desktop"; - version = "4.12.1-35"; + version = "4.12.2-36"; src = fetchurl { - # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs - # c.f. https://github.com/NixOS/nixpkgs/pull/111616 - url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8="; + url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm"; + sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q="; }; unpackPhase = '' @@ -35,11 +34,12 @@ mkDerivation rec { buildInputs = [ alsa-lib flac + gcc11.cc.lib libmicrohttpd llvmPackages_10.openmp - qtquickcontrols2 qtcharts qtdeclarative + qtquickcontrols2 qtwebengine qtwebview wavpack diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index f37150994fc..31f0bbbb4c7 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -19,8 +19,6 @@ mkDerivation rec { installFlags = [ "INSTALL_ROOT=$(out)" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Graphical open-source sequencer"; homepage = "https://www.iannix.org/"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6f0d34b870a..518c54dc48a 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchurl , fetchFromGitHub @@ -110,12 +111,27 @@ mkDerivation rec { wavpack ]; - enableParallelBuilding = true; - qtWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; + # mixxx installs udev rules to DATADIR instead of SYSCONFDIR + # let's disable this and install udev rules manually via postInstall + # see https://github.com/mixxxdj/mixxx/blob/2.3.0/CMakeLists.txt#L1381-L1392 + cmakeFlags = [ + "-DINSTALL_USER_UDEV_RULES=OFF" + ]; + + postInstall = lib.optionalString stdenv.isLinux '' + rules="$src/res/linux/mixxx-usb-uaccess.rules" + if [ ! -f "$rules" ]; then + echo "$rules is missing, must update the Nix file." + exit 1 + fi + mkdir -p "$out/lib/udev/rules.d" + cp "$rules" "$out/lib/udev/rules.d/69-mixxx-usb-uaccess.rules" + ''; + meta = with lib; { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 24f9f057b65..6c8ad8225f0 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); + checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 9e338e19813..4898648599c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -6,6 +6,8 @@ , intltool , libpeas , libsoup +, libsecret +, libnotify , libdmapsharing , gnome , totem-pl-parser @@ -17,8 +19,6 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - pname = "rhythmbox"; - version = "3.4.4"; # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. @@ -39,10 +39,11 @@ let }); in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "rhythmbox"; + version = "3.4.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; }; @@ -66,11 +67,21 @@ in stdenv.mkDerivation rec { 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-libav libdmapsharing_3 # necessary for daap support + libsecret + libnotify ] ++ gst_plugins; - configureFlags = [ "--enable-daap" ]; + configureFlags = [ + "--enable-daap" + "--enable-libnotify" + "--with-libsecret" + ]; enableParallelBuilding = true; @@ -84,7 +95,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; description = "A music playing application for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.rasendubi ]; }; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 5a5671ec773..6cc55650220 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -19,29 +19,30 @@ , protobuf , sqlite , taglib -, libpulseaudio ? null -, libselinux ? null -, libsepol ? null -, p11-kit ? null -, util-linux ? null +, libpulseaudio +, libselinux +, libsepol +, p11-kit +, util-linux , qtbase , qtx11extras , qttools , withGstreamer ? true -, gst_all_1 ? null +, glib-networking +, gst_all_1 , withVlc ? true -, libvlc ? null +, libvlc }: mkDerivation rec { pname = "strawberry"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256:0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2"; + sha256 = "sha256-OOdHsii6O4okVHDhrqCNJ7WVB0VKPs8q0AhEY+IvflE="; }; buildInputs = [ @@ -61,29 +62,33 @@ mkDerivation rec { taglib qtbase qtx11extras - ] - ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libpulseaudio libselinux libsepol p11-kit - ] - ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ lib.optionals withGstreamer (with gst_all_1; [ + glib-networking gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly - ]) - ++ lib.optional withVlc libvlc; + ]) ++ lib.optional withVlc libvlc; nativeBuildInputs = [ - cmake ninja pkg-config qttools + cmake + ninja + pkg-config + qttools ] ++ lib.optionals stdenv.isLinux [ util-linux ]; - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + postInstall = lib.optionalString withGstreamer '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ) ''; meta = with lib; { diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 02e23084cf5..320a26b8172 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { tagparser ]; - enableParallelBuilding = true; - meta = with pkgs.lib; { homepage = "https://github.com/Martchus/tageditor"; description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 137014508a3..00be0934552 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -12,6 +12,7 @@ , fribidi , pango , freetype +, curl }: stdenv.mkDerivation rec { @@ -50,6 +51,10 @@ stdenv.mkDerivation rec { mv $out/bin/ToneLib-GFX $out/bin/tonelib-gfx ''; + runtimeDependencies = [ + (lib.getLib curl) + ]; + meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass."; homepage = "https://tonelib.net/"; diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index c58023d6a4b..7a5a5c7280f 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -12,6 +12,7 @@ , fribidi , pango , freetype +, curl }: stdenv.mkDerivation rec { @@ -50,6 +51,10 @@ stdenv.mkDerivation rec { mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam ''; + runtimeDependencies = [ + (lib.getLib curl) + ]; + meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/"; diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 94ef3037a7c..2eef1f7bd60 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -6,6 +6,7 @@ , webkitgtk , libjack2 , alsa-lib +, curl }: stdenv.mkDerivation rec { @@ -38,6 +39,10 @@ stdenv.mkDerivation rec { mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom ''; + runtimeDependencies = [ + (lib.getLib curl) + ]; + meta = with lib; { description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index d942ac768a8..ba029aedeeb 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, - dotnetPackages, dotnetCorePackages + dotnetPackages, dotnetCorePackages, altcoinSupport ? false }: let @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { nuget sources Add -Name tmpsrc -Source $TMP/nuget nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget - dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj - dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj + dotnet restore --source $TMP/nuget ${lib.optionalString altcoinSupport ''/p:Configuration="Altcoins-Release"''} BTCPayServer/BTCPayServer.csproj + dotnet publish --no-restore --output $out/share/$pname ${lib.optionalString altcoinSupport "-c Altcoins-Release"} BTCPayServer/BTCPayServer.csproj ''; # btcpayserver requires the publish directory as its working dir diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 20b97972107..8884dc2fe14 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -85,6 +85,11 @@ sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; }) (fetchNuGet { + name = "Common.Logging.Core"; + version = "3.4.1"; + sha256 = "06h80c7l12nh6gnkzskcs4w8741xhprv72vf88f33ilzfy37h5jy"; + }) + (fetchNuGet { name = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; @@ -761,6 +766,11 @@ }) (fetchNuGet { name = "NBitcoin"; + version = "5.0.33"; + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + }) + (fetchNuGet { + name = "NBitcoin"; version = "5.0.4"; sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; }) @@ -795,6 +805,86 @@ sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; }) (fetchNuGet { + name = "Nethereum.ABI"; + version = "3.8.0"; + sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c"; + }) + (fetchNuGet { + name = "Nethereum.Accounts"; + version = "3.8.0"; + sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m"; + }) + (fetchNuGet { + name = "Nethereum.BlockchainProcessing"; + version = "3.8.0"; + sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax"; + }) + (fetchNuGet { + name = "Nethereum.Contracts"; + version = "3.8.0"; + sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8"; + }) + (fetchNuGet { + name = "Nethereum.HdWallet"; + version = "3.8.0"; + sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2"; + }) + (fetchNuGet { + name = "Nethereum.Hex"; + version = "3.8.0"; + sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6"; + }) + (fetchNuGet { + name = "Nethereum.JsonRpc.Client"; + version = "3.8.0"; + sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l"; + }) + (fetchNuGet { + name = "Nethereum.JsonRpc.RpcClient"; + version = "3.8.0"; + sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a"; + }) + (fetchNuGet { + name = "Nethereum.KeyStore"; + version = "3.8.0"; + sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s"; + }) + (fetchNuGet { + name = "Nethereum.Model"; + version = "3.8.0"; + sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh"; + }) + (fetchNuGet { + name = "Nethereum.RLP"; + version = "3.8.0"; + sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym"; + }) + (fetchNuGet { + name = "Nethereum.RPC"; + version = "3.8.0"; + sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb"; + }) + (fetchNuGet { + name = "Nethereum.Signer"; + version = "3.8.0"; + sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf"; + }) + (fetchNuGet { + name = "Nethereum.StandardTokenEIP20"; + version = "3.8.0"; + sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g"; + }) + (fetchNuGet { + name = "Nethereum.Util"; + version = "3.8.0"; + sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8"; + }) + (fetchNuGet { + name = "Nethereum.Web3"; + version = "3.8.0"; + sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i"; + }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; @@ -915,6 +1005,11 @@ sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; }) (fetchNuGet { + name = "Portable.BouncyCastle"; + version = "1.8.2"; + sha256 = "0xqc8q40lr4r7ahsmzpa1q0jagp12abb6rsj80p37q34hsv5284q"; + }) + (fetchNuGet { name = "QRCoder"; version = "1.4.1"; sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch"; diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 9debe6780f2..082911b42a3 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -8,4 +8,5 @@ echo "Updating nbxplorer" ../nbxplorer/update.sh echo echo "Updating btcpayserver" -../nbxplorer/util/update-common.sh btcpayserver deps.nix +# Include Razor SDK packages in deps.nix +../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 88439d6bdbf..9985113b08a 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.14.2"; + version = "1.14.3"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy"; + sha256 = "sha256-kozUnIislQDtgjeesYHKu4sB1j9juqaWvyax+Lb/0pc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/blockchains/eclair.nix b/pkgs/applications/blockchains/eclair.nix new file mode 100644 index 00000000000..7b74512a388 --- /dev/null +++ b/pkgs/applications/blockchains/eclair.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchzip +, jq +, openjdk11 +}: + +stdenv.mkDerivation rec { + pname = "eclair"; + version = "0.6.1"; + revision = "d3ae323"; + + src = fetchzip { + url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip"; + sha256 = "0hmdssj6pxhvadrgr1svb2lh7hfbd2axr5wsl7glizv1a21g0l2c"; + }; + + propagatedBuildInputs = [ jq openjdk11 ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -a * $out + mv $out/bin/eclair-node.sh $out/bin/eclair-node + rm $out/bin/eclair-node.bat + + runHook postInstall + ''; + + meta = with lib; { + description = "A scala implementation of the Lightning Network"; + homepage = "https://github.com/ACINQ/eclair"; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 8b8ff3f48ba..a0e648218f5 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.12"; + version = "4.0.13"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-cIMaCouzuI7UQ6UY4caGcTzA+Xp7vLdoOwIfGG+ahsU="; + sha256 = "sha256-HNpyUD2Tep2XnY3lr5a3ec+NmJtt0VvJx6ujVvSugXo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 851a1b1d040..f14af0ae796 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.14.1-beta"; + version = "0.14.2-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "0fnbf0cryrw9yk3z1g7innv1rxxk7h2lhfakdj994l5a0pgzghmy"; + sha256 = "02ndln0n5k2pin9pngjcmn3wak761ml923111fyqb379zcfscrfv"; }; - vendorSha256 = "1i7mmf4ab4a6h08df6zlyjdnmvn44i2y3fc05hq6g1ln1bzdrz40"; + vendorSha256 = "1izdd9i4bqzmwagq0ilz2s37jajvzf1xwx3hmmbd1k3ss7mjm72r"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index e8c6d14b3db..c956bca9a1a 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -1,21 +1,21 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" ] +, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" ] }: buildGoModule rec { pname = "lnd"; - version = "0.13.0-beta"; + version = "0.13.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0fwidjkfzzd7k891x5z7jrx2arl0kwj6vm9z2acsyy7riv4zfjbq"; + sha256 = "07cs9yq83laajmfwfv42xfkfai3q873wg4qg7bfzw18w5fllivkg"; }; - vendorSha256 = "19myr9f5zh05y6lagd9pra60y8df7pz837310cbpq9a6zzwpdxk2"; + vendorSha256 = "1hk67x8nlc0wm1pg8k8hywih623p4c0klfhfyy26b7mqq62lazia"; subPackages = ["cmd/lncli" "cmd/lnd"]; diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh index 5db2723ef8e..caab20c928f 100755 --- a/pkgs/applications/blockchains/nbxplorer/update.sh +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -3,4 +3,4 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 14b1687dfff..fb10446142e 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -7,6 +7,7 @@ set -euo pipefail pkgSrc=$1 depsFile=$(realpath "$2") +customFlags=$3 sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } @@ -20,7 +21,7 @@ pushd "$tmpdir" > /dev/null mkdir home echo "Running dotnet restore for $sln" HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - dotnet restore -v normal --no-cache "$sln" > restore_log + dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log echo "{ fetchNuGet }: [" > "$depsFile" while read pkgSpec; do diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 7a9262bf483..a9912b8b368 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -8,6 +8,7 @@ set -euo pipefail pkgName=$1 depsFile=$2 +customFlags=$3 : ${getVersionFromTags:=} : ${refetch:=} @@ -71,4 +72,4 @@ echo # Create deps file storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" -. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" +. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e0cf5138310..0ead5ff670c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,17 +9,17 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.2.1.0"; # "Android Studio 4.2.1" - build = "202.7351085"; - sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; + version = "4.2.2.0"; # "Android Studio 4.2.2" + build = "202.7486908"; + sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk"; }; betaVersion = { - version = "2020.3.1.16"; # "Android Studio Arctic Fox (2020.3.1) Beta 1" - sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0"; + version = "2020.3.1.20"; # "Android Studio Arctic Fox (2020.3.1) Beta 5" + sha256Hash = "0swcsjx29ar4b0c8yhbynshqdn2sv94ga58h2nrc99927vp17g85"; }; latestVersion = { # canary & dev - version = "2021.1.1.1"; # "Android Studio Bumblebee (2021.1.1) Canary 1" - sha256Hash = "0aavmk8byw817356jm28rl998gcp3zm7x3fq14hm2awzhk5jaklm"; + version = "2021.1.1.3"; # "Android Studio Bumblebee (2021.1.1) Canary 3" + sha256Hash = "1n8iahaqhmzvpps9vhv93n3yabb26vl78yndd6gid028r8r90y4x"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 5d4c438bce9..c2ea756a06e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -2,10 +2,10 @@ let pkgs = import ../../../../.. { }; src = pkgs.fetchgit { - url = "https://github.com/ttuegel/emacs2nix.git"; + url = "https://github.com/nix-community/emacs2nix.git"; fetchSubmodules = true; - rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923"; - sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df"; + rev = "703b144eeb490e87133c777f82e198b4e515c312"; + sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI="; }; in pkgs.mkShell { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix new file mode 100644 index 00000000000..0ab44fccc8e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -0,0 +1,93 @@ +{ callPackage }: + { + caml = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "caml"; + ename = "caml"; + version = "4.7.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar"; + sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/caml.html"; + license = lib.licenses.free; + }; + }) {}; + markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "markdown-mode"; + ename = "markdown-mode"; + version = "2.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar"; + sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/markdown-mode.html"; + license = lib.licenses.free; + }; + }) {}; + org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: + elpaBuild { + pname = "org-contrib"; + ename = "org-contrib"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar"; + sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-contrib.html"; + license = lib.licenses.free; + }; + }) {}; + request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "request"; + ename = "request"; + version = "0.3.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar"; + sha256 = "168yy902bcjfdaahsbzhzb4wgqbw1mq1lfwdjh66fpzqs75c5q00"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/request.html"; + license = lib.licenses.free; + }; + }) {}; + sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sly"; + ename = "sly"; + version = "1.0.43"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar"; + sha256 = "0qgji539qwk7lv9g1k11w0i2nn7n7nk456gwa0bh556mcqz2ndr8"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sly.html"; + license = lib.licenses.free; + }; + }) {}; + tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tuareg"; + ename = "tuareg"; + version = "2.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar"; + sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb"; + }; + packageRequires = [ caml emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tuareg.html"; + license = lib.licenses.free; + }; + }) {}; + } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix new file mode 100644 index 00000000000..c3459448c28 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -0,0 +1,32 @@ +/* + +# Updating + +To update the list of packages from nongnu (ELPA), + +1. Run `./update-nongnu`. +2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`. +3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix` + +*/ + +{ lib }: + +self: let + + generateNongnu = lib.makeOverridable ({ + generated ? ./nongnu-generated.nix + }: let + + imported = import generated { + inherit (self) callPackage; + }; + + super = imported; + + overrides = { + }; + + in super // overrides); + +in generateNongnu { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu new file mode 100755 index 00000000000..dc43a86efbe --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu @@ -0,0 +1,4 @@ +#! /usr/bin/env nix-shell +#! nix-shell --show-trace ./emacs2nix.nix -i bash + +exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index d47c315f613..d39c29dc6a5 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -12,8 +12,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ hunspell qtbase qtmultimedia ]; - enableParallelBuilding = true; - qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 75f22da2516..80220241eb6 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -19,8 +19,6 @@ mkDerivation rec { "METAINFODIR=${placeholder "out"}/share/metainfo" ]; - enableParallelBuilding = true; - meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index fe32da4a42f..4fdb4a44b24 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ python qtbase qttools ]; - enableParallelBuilding = true; - meta = with lib; { description = "Free, easy to use and flexible tile map editor"; homepage = "https://www.mapeditor.org/"; diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/graphics/coreimage/default.nix new file mode 100644 index 00000000000..1dcff1f6e8f --- /dev/null +++ b/pkgs/applications/graphics/coreimage/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: + +mkDerivation rec { + pname = "coreimage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + ]; + + meta = with lib; { + description = "An image viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index b9b2eb36873..33bae268c8a 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -41,7 +41,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pytest pytest-xvfb pytest-mock - pytestcov + pytest-cov pytest-repeat pytest-qt ]; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 7cdf32cc8e7..d176ce38f0a 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; buildInputs = [ qtbase poppler ]; - enableParallelBuilding = true; qmakeFlags = [ "DESKTOP_INSTALL_DIR=${placeholder "out"}/share/applications" diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 5c727dbbaab..8fdd805803b 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -18,8 +18,6 @@ mkDerivation rec { buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; - enableParallelBuilding = true; - meta = { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 68b4f7b3e56..e8b8714ca2a 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,20 +1,41 @@ { lib, python3, fetchFromGitHub }: -with python3.pkgs; buildPythonApplication rec { - version = "4.5"; +let + python3' = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); + sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec { + version = "0.36.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs"; + }; + }); + }; + }; +in +with python3'.pkgs; buildPythonApplication rec { + version = "4.6"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1lcq5fk8d5j2kfhn9m5l2hk46v7nj4vfa22m1psz35c9zpw4px8q"; + sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0="; }; checkInputs = [ - pytestcov + pytest-cov hypothesis pytest + pytest-vcr pylint flake8 pyyaml @@ -55,8 +76,8 @@ with python3.pkgs; buildPythonApplication rec { # Disables a test which requires internet substituteInPlace tests/test_bukuDb.py \ --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \ - --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \ - --replace "self.assertEqual(url, 'https://www.google.com')" "" + --replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \ + --replace "self.assertEqual(url, \"https://www.google.com\")" "" substituteInPlace setup.py \ --replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1 ''; @@ -75,7 +96,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ]; }; } diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ef307ce3460..daef73a5679 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.38"; + version = "0.99.39"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-04MRw6pMtJGxTMKwOzPNGg1T85SfVY5bMkF3gt2V0e0="; + sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 192cddc2e17..7b52145f794 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-CuTYCNZ9oiDsm5mUDmjbxkmAl61PEXv3WMrZRzgdZeE="; + sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index de1dacd50c2..5c96a328224 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,32 +1,68 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake -, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git -, webkitSupport ? true +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, qtbase +, qtscript +, libXfixes +, libXtst +, qtx11extras +, git +, knotifications +, qtwayland +, wayland +, fetchpatch }: mkDerivation rec { pname = "CopyQ"; - version = "3.13.0"; + version = "4.1.0"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah"; + sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ - git qtbase qtscript libXfixes libXtst qtx11extras - ] ++ lib.optional webkitSupport qtwebkit; + qtbase + qtscript + libXfixes + libXtst + qtx11extras + knotifications + qtwayland + wayland + ]; + + patches = [ + # Install the bash completion script correctly + # Remove once 4.1.1 is released + (fetchpatch { + url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch"; + sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl"; + }) + ]; + + postPatch = '' + substituteInPlace shared/com.github.hluk.copyq.desktop.in \ + --replace copyq "$out/bin/copyq" + ''; meta = with lib; { - homepage = "https://hluk.github.io/CopyQ"; + homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; - license = licenses.gpl3; - maintainers = [ maintainers.willtim ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ willtim artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. # OSX build requires QT5. - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 56938f5338d..954501c0b7f 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec { buildInputs = with pythonPackages; [ glibcLocales ]; - propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; checkInputs = with pythonPackages; [ pytest mock ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4197c1af040..28c965a72b5 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.3"; + version = "4.1.5"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781"; + sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk"; extraPostFetch = '' mv $out ./all @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf"; + sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi"; }; postUnpack = '' @@ -154,6 +154,8 @@ python3.pkgs.buildPythonApplication { of the blockchain. ''; homepage = "https://electrum.org/"; + downloadPage = "https://electrum.org/#download"; + changelog = "https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ joachifm np prusnak ]; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 26c6a8cbc70..e8f329ecb0d 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "formatter"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Djaler"; repo = "Formatter"; rev = version; - sha256 = "0da1dvzsvbwg1ys19yf0n080xc0hjwin9zacjndb24jvphy3bxql"; + sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo="; }; patches = [ diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 6fde2c8fac8..802c1532979 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; + sha256 = "sha256-GPECj0CVxKh+gTfAkkvs13tdiy93il97iqbSTxLQSiM="; }; nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index a30778762b2..c182db8fdd3 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "grip-4.2.1"; + name = "grip-4.2.2"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "sha256-3bFJURPbq9rzLsJCppRjSARhcOJxC4eSfw5VxvZgQ3Q="; + sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE="; }; nativeBuildInputs = [ pkg-config libtool ]; diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 4ca373ee275..300423cb7f6 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -2,6 +2,7 @@ , python3Packages , fetchFromGitHub , wrapQtAppsHook +, cups }: with python3Packages; @@ -17,6 +18,11 @@ buildPythonApplication rec { sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; }; + postPatch = '' + substituteInPlace inkcut/device/transports/printer/plugin.py \ + --replace ", 'lpr', " ", '${cups}/bin/lpr', " + ''; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 2d9a2ca5904..527c2f3bab1 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.8.5"; + version = "2.1.9"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "11csbr72i5kac2bk7wpa877lay2z1n58s0yildkfnjy552ihdxny"; - x86_64-darwin = "1n0ni3ixml99ag83bcn5wg6f0kldjhwkkddd9km37ykr8vxxl952"; + x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9"; + x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c7c184febe1..8ad7578adeb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -20,7 +20,7 @@ with python3.pkgs; buildPythonApplication rec { pkgs.vdirsyncer pytz pyxdg - requests_toolbelt + requests-toolbelt tzlocal urwid pkginfo diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index f281ab5a4cb..7367d18ddf8 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.3"; + version = "0.2.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0="; + sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix new file mode 100644 index 00000000000..dd634ae7f13 --- /dev/null +++ b/pkgs/applications/misc/mnamer/default.nix @@ -0,0 +1,46 @@ +{ python3Packages, fetchFromGitHub, lib }: + +python3Packages.buildPythonApplication rec { + pname = "mnamer"; + version = "2.5.3"; + + src = fetchFromGitHub { + owner = "jkwill87"; + repo = "mnamer"; + rev = version; + sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd"; + }; + + propagatedBuildInputs = with python3Packages; [ + babelfish + requests + appdirs + teletype + requests-cache + guessit + ]; + + patches = [ + # requires specific old versions of dependencies which have been updated in nixpkgs + ./remove_requirements.patch + + # author reads a private property that changed between versions + ./update_hack.patch + ]; + + checkInputs = [ python3Packages.pytestCheckHook ]; + + # disable test that fail (networking, etc) + disabledTests = [ + "network" + "e2e" + "test_utils.py" + ]; + + meta = with lib; { + homepage = "https://github.com/jkwill87/mnamer"; + description = "An intelligent and highly configurable media organization utility"; + license = licenses.mit; + maintainers = with maintainers; [ urlordjames ]; + }; +} diff --git a/pkgs/applications/misc/mnamer/remove_requirements.patch b/pkgs/applications/misc/mnamer/remove_requirements.patch new file mode 100644 index 00000000000..46fc0571ce5 --- /dev/null +++ b/pkgs/applications/misc/mnamer/remove_requirements.patch @@ -0,0 +1,21 @@ +diff --git a/setup.py b/setup.py +index 245c1dd..fdc17ab 100755 +--- a/setup.py ++++ b/setup.py +@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION + with open("readme.md", "r", encoding="utf8") as fp: + LONG_DESCRIPTION = fp.read() + +-with open("requirements.txt", "r", encoding="utf8") as fp: +- REQUIREMENTS = fp.read().splitlines() +- + setup( + author="Jessy Williams", + author_email="jessy@jessywilliams.com", + description="A media file organiser", + entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]}, + include_package_data=True, +- install_requires=REQUIREMENTS, + license="MIT", + long_description=LONG_DESCRIPTION, + long_description_content_type="text/markdown", diff --git a/pkgs/applications/misc/mnamer/update_hack.patch b/pkgs/applications/misc/mnamer/update_hack.patch new file mode 100644 index 00000000000..56c83a20a9c --- /dev/null +++ b/pkgs/applications/misc/mnamer/update_hack.patch @@ -0,0 +1,13 @@ +diff --git a/mnamer/utils.py b/mnamer/utils.py +index 636b596..e52bd37 100644 +--- a/mnamer/utils.py ++++ b/mnamer/utils.py +@@ -280,7 +280,7 @@ def request_json( + "like Gecko) Chrome/79.0.3945.88 Safari/537.36" + ) + +- initial_cache_state = session._is_cache_disabled # yes, i'm a bad person ++ initial_cache_state = session._disabled # yes, i'm a bad person + try: + session._is_cache_disabled = not cache + response = session.request( diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index cbb7a110c4c..b55497a168c 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -14,8 +14,6 @@ mkDerivation rec { buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; postPatch = '' diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix new file mode 100644 index 00000000000..4e6518c6ffd --- /dev/null +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, cairo +, gobject-introspection +, gtk3 +, gtk-layer-shell +}: + +buildGoModule rec { + pname = "nwg-drawer"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg="; + }; + + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + + meta = with lib; { + description = "Application drawer for sway Wayland compositor"; + homepage = "https://github.com/nwg-piotr/nwg-drawer"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ plabadens ]; + }; +} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 750043d4a9e..d7393313c15 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -50,19 +50,25 @@ let } ) - # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in - # the mkOverride aboves, this package also has broken tests, so we need - # a proper override. + # Octoprint needs zeroconf >=0.24 <0.25. This can't be done via mkOverride, because in zeroconf 0.32 + # the super package was migrated to fetchFromGitHub. ( self: super: { zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec { version = "0.24.5"; - src = oldAttrs.src.override { + src = super.fetchPypi { + inherit (oldAttrs) pname; inherit version; sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; }; - buildInputs = [ self.nose ]; - checkPhase = "nosetests"; + pythonImportsCheck = [ + "zeroconf" + ]; + buildInputs = with self; [ + pytestCheckHook + nose + ]; + pytestFlagsArray = [ "zeroconf/test.py" ]; }); } ) diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index e815fd7a39f..663a7bf43ea 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -13,7 +13,6 @@ mkDerivation { buildInputs = [ qtbase vcg glew ]; - enableParallelBuilding = true; nativeBuildInputs = [ qmake ]; qmakeFlags = [ "openBrf.pro" ]; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 101a626f2c3..4f2af99ab14 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -29,7 +29,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.mpickering ]; platforms = with lib.platforms; linux; - # it probably needs https://proj.org/development/migration.html - broken = true; }; } diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 5eb43c0e357..0e473c6a1ba 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index d387468bcdd..9096a56a421 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -39,8 +39,6 @@ mkDerivation rec { variables.pri ''; - enableParallelBuilding = true; - postInstall = '' ln -sf $out/lib/*/libqlcplus* $out/lib ''; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index faa19914749..37fab140321 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -24,8 +24,6 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools ]; - enableParallelBuilding = true; - patches = [ # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded. # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available. diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix new file mode 100644 index 00000000000..0a1d38f5f7f --- /dev/null +++ b/pkgs/applications/misc/rm-improved/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub, rustPlatform, lib }: + +with lib; + +rustPlatform.buildRustPackage rec { + pname = "rm-improved"; + version = "0.13.0"; + + cargoSha256 = "0wgpr6gx9dpvf02xgvrdbyiqfz1k9vipnvriz3jg0cz7n1afqisj"; + + src = fetchFromGitHub { + owner = "nivekuil"; + repo = "rip"; + rev = "0.13.0"; + sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3"; + }; + + meta = { + description = "Replacement for rm with focus on safety, ergonomics and performance"; + homepage = "https://github.com/nivekuil/rip"; + maintainers = with maintainers; [ nils-degroot ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 79a4d9fc7ab..d0d59af604d 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -5,7 +5,7 @@ , waylandSupport ? true , x11Support ? true -, ConfigArgParse +, configargparse , rofi , wl-clipboard , wtype @@ -26,7 +26,7 @@ buildPythonApplication rec { # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ ConfigArgParse rofi ] + propagatedBuildInputs = with lib; [ configargparse rofi ] ++ optionals waylandSupport [ wl-clipboard wtype ] ++ optionals x11Support [ xdotool xsel ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d5a7d6f0fd6..ba3880aa201 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -64,8 +64,6 @@ let mv lib $out/ ''; - enableParallelBuilding = true; - meta = with lib; { inherit (src.meta) homepage; description = "QtLocation plugin for Google maps tile API"; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index ee781c75e69..812c9b72f99 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { - url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; + url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj"; }) (fetchurl { diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index e83a5e9a2c7..9d1df5245ed 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,12 +1,20 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }: -stdenv.mkDerivation { - name = "udevil-0.4.4"; - src = fetchurl { - url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; - sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; +{ lib, stdenv, fetchFromGitHub, intltool, glib, pkg-config, udev, util-linux, acl }: + +stdenv.mkDerivation rec { + pname = "udevil"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "IgnorantGuru"; + repo = "udevil"; + rev = version; + sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ intltool glib udev ]; + configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" # do not set setuid bit in nix store @@ -19,11 +27,18 @@ stdenv.mkDerivation { --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; + + postInstall = '' + substituteInPlace $out/lib/systemd/system/devmon@.service \ + --replace /usr/bin/devmon "$out/bin/devmon" + ''; + patches = [ ./device-info-sys-stat.patch ]; - meta = { + + meta = with lib; { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = "https://ignorantguru.github.io/udevil/"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 13b09865c6a..5994df7c559 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx"; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{share/vue,bin} diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index e41bc6bd20d..d669b97c44d 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "unstable-2021-07-10"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "getzola"; repo = pname; # unstable because the latest release fails to build - rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1"; - sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA="; + rev = "312ffcb04c06c5f157b9fd2b944b858703238592"; + sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w"; }; - cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4="; + cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8"; nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A fast static site generator with everything built-in"; homepage = "https://www.getzola.org/"; license = licenses.mit; - maintainers = with maintainers; [ dywedir _0x4A6F ]; + maintainers = with maintainers; [ dandellion dywedir _0x4A6F ]; # set because of unstable-* version mainProgram = "zola"; }; diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 18f9a7990c3..970949d691e 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,21 +1,9 @@ { lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: -let - desktopItem = makeDesktopItem { - name = "apache-directory-studio"; - exec = "ApacheDirectoryStudio"; - icon = "apache-directory-studio"; - comment = "Eclipse-based LDAP browser and directory client"; - desktopName = "Apache Directory Studio"; - genericName = "Apache Directory Studio"; - categories = "Java;Network"; - }; - version = "2.0.0-M15"; - versionWithDate = "2.0.0.v20200411-M15"; -in stdenv.mkDerivation rec { pname = "apache-directory-studio"; - inherit version; + version = "2.0.0-M15"; + versionWithDate = "2.0.0.v20200411-M15"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -25,6 +13,16 @@ stdenv.mkDerivation rec { } else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + desktopItem = makeDesktopItem { + name = "apache-directory-studio"; + exec = "ApacheDirectoryStudio"; + icon = "apache-directory-studio"; + comment = "Eclipse-based LDAP browser and directory client"; + desktopName = "Apache Directory Studio"; + genericName = "Apache Directory Studio"; + categories = "Java;Network"; + }; + buildInputs = [ glib libsecret ]; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7b2acbd6b3d..7bbbbe082d9 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.26.74"; + version = "1.26.77"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY="; + sha256 = "tV/VseU+IncvM3gdrmqkYLPClbsf2kSvIAZj0Ylz2Rw="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index b302be4e013..335223883fa 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "captive-browser"; + pname = "captive-browser"; version = "2019-04-16"; - goPackagePath = name; + goPackagePath = pname; src = fetchFromGitHub { owner = "FiloSottile"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 602e2e6a829..623bc3c33d7 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,9 +62,9 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop - '' + lib.optionalString (channel != "stable") '' + '' + '' cp -v "$buildPath/crashpad_handler" "$libExecPath/" - ''; + ''; # TODO: Merge passthru = { inherit sandboxExecutableName; }; @@ -88,7 +88,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; mainProgram = "chromium"; - hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") + hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium" || channel == "beta") then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 18565f31a2f..6daafc204eb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -167,6 +167,19 @@ let # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch + ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [ + # Required as dependency for the next patch: + (githubPatch { + # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat"" + commit = "4b438323d68840453b5ef826c3997568e2e0e8c7"; + sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82"; + }) + # To fix the text rendering, see #131074: + (githubPatch { + # Linux sandbox: fix fstatat() crash + commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; + sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; + }) ] ++ lib.optionals (chromiumVersionAtLeast "93") [ # We need to revert this patch to build M93 with LLVM 12. (githubPatch { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 535b87a87fd..33619f27350 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,8 +1,7 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit -, libva ? null -, pipewire +, libva, pipewire, wayland , gcc, nspr, nss, runCommand , lib @@ -165,7 +164,7 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - libPath = lib.makeLibraryPath [ libva pipewire ]; + libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 ]; in with lib; '' mkdir -p "$out/bin" diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 299b19f2f4f..a8e84dae196 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "ungoogled-chromium-${version}"; + pname = "ungoogled-chromium"; version = rev; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d7b14cb4ba6..a6df334a97d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,26 +1,26 @@ { "stable": { - "version": "91.0.4472.164", - "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", - "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", + "version": "92.0.4515.107", + "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", + "sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj", "deps": { "gn": { - "version": "2021-04-06", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", - "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" } }, "chromedriver": { - "version": "91.0.4472.101", - "sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng", - "sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68" + "version": "92.0.4515.43", + "sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw", + "sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f" } }, "beta": { - "version": "92.0.4515.101", - "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd", - "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0", + "version": "92.0.4515.107", + "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", + "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd", "deps": { "gn": { "version": "2021-05-07", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4573.0", - "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck", - "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1", + "version": "93.0.4577.8", + "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1", + "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w", "deps": { "gn": { "version": "2021-07-08", diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d16c625e2db..5ef51028136 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -80,12 +80,12 @@ let source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; - name = "firefox-${channel}-bin-unwrapped-${version}"; + pname = "firefox-${channel}-bin-unwrapped"; in stdenv.mkDerivation { - inherit name; + inherit pname version; src = fetchurl { inherit (source) url sha256; }; @@ -189,7 +189,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 12c76c8e4dd..5813868286a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "90.0"; + version = "90.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ach/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ach/firefox-90.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b21effb602d202574d3498a2a1d4d381f1581eb794691123fa00eb25adb21b5a"; + sha256 = "b985849c5109b6a9992ca0fc4699b769af37c84f1aea5fc6c1b66845f51da83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/af/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/af/firefox-90.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2ee727fe495f586ca0f825e1bbadd4d737b1c6e4050ad1e77f3cb84cd9d50e3a"; + sha256 = "7ddb078a80b7991576f691a1c3bc76635621aa13d64c465651e16ae4dade7436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/an/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/an/firefox-90.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f33700fc2178d6ea0bc6bd47cf16744a7551e3987abe9cd9bb891cd48a019000"; + sha256 = "dca47858177ed263332c7cb093e3285b5c8f61782a66cf683ee52896c3fc76a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ar/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ar/firefox-90.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5633334afb6a338a861b665c78209ba13558c0b6dfab44f80cd690533633575d"; + sha256 = "2249834099e5cc9a5feb0b38bdc277e5e3f65635b1a1179afe1240113f0ee1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ast/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ast/firefox-90.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "98fff4f8216441b7b404dc00ca4bbd3b8161514dde85bfe56c23ea15a20c1ba6"; + sha256 = "7ad21576299643e480922a2a7b6077a0edc84d362e33bb8318b33d04133a7c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/az/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/az/firefox-90.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "02a48160df4f22842f09bbf54190ed91f83f0b0af9b15134ce6f83a163de8891"; + sha256 = "10eabc925d651985229d6bac1c34b12267a31886f5354ba943178f6a2d0ef04a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/be/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/be/firefox-90.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1848205609b3bb57a84fb2ddd002e57868dce7f2046a4603e2058fb4bf6b4046"; + sha256 = "d1e6d939233b23e5378161c79f338e66c010056d9d3e619b9eb6c26dc4461724"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bg/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bg/firefox-90.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "27a40aba90c5b8ef51d2077770ee0803e0d8327db36d1f95a463c54ca74a7536"; + sha256 = "d59e69127462aa3efff558d5cd5035951dbe54161f913dacb4142a8bd3f258fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bn/firefox-90.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "490da4669e9711bbdb309abba2251b88407ec843065b5c81e61cae5be59d8e9e"; + sha256 = "56ca1d7e84ada3f0124e36186a32dfdf287547bdc8d3b111baf9407fedf0a7ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/br/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/br/firefox-90.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "be50bcfb6bfc9144cf690165801abc294dfa9b67597d727f7707025b8a61be97"; + sha256 = "33a6ceb6d37b73d03fe5a6e93e19e29346b2861ee69ab2fffd6cca4a2dbaf40f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bs/firefox-90.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "90fcf0f8a7fa13ca4157ec710e06053485df7e47264ba46bebe4551154244b89"; + sha256 = "7c853a13afd74307e7a468b85ed430b20f1622dbecb697b8c80945ccea9f0805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca-valencia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca-valencia/firefox-90.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bb32faff40658d974d9f1909ee574043c3501d7d5149629a8abce919aeb37232"; + sha256 = "0aa103c471b3f71ef638cbf9e8f83447875ef5cd96bdc8535435188510272c65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca/firefox-90.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bd5b977e54ee504dce9aafcb093419b23da0c85ca1f84c6c0060014d3ec3b32a"; + sha256 = "4672d9fe667f72de45af1eb6a205792440afa9de86eae1f33426d3b948fbc841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cak/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cak/firefox-90.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "aa2e5b116ebfc296cfb6522b2b35bf006cd2d4154b04d20ac4c6a720fad90008"; + sha256 = "7b12a52926888f52957a75f639f09094dc4cbc18a1c6d14bf433028461c4a71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cs/firefox-90.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ec9b5c46617f9ef8f29374793c8a5f272d370b9e974d004ec0db85a65b5a76d3"; + sha256 = "7dfdf0c4c740dab356205c52384faf61e9963a42675031f0292be1c0f4e402c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cy/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cy/firefox-90.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "17ef10b7e321db0374c87595d13e4bad57707902dd02a4a20e7f375ff328b905"; + sha256 = "ad7f76b997bced6df5c240273fb736fe7dcb0c86ae867a5cbdb5097dd5c382ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/da/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/da/firefox-90.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "46d83a4256eb11f5db42039184e0ed138280f21ecdbafb1e7533399cfd58f88d"; + sha256 = "9f59ff2eec510b75312bcbe29e9706fe0710f300c12e33200937571414254d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/de/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/de/firefox-90.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b4417505454008a2722c691c9006450d90ec80c7461eaf0ecb9b4f9cc0883ed0"; + sha256 = "c838f9238939cc8e91fff903a231062c03388c2202e273f7b99701415a8f3f22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/dsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/dsb/firefox-90.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8eec9d5753aaa92c31fd52556595c9fb5889f36904cb05722bb2d727fa618941"; + sha256 = "5370c32283f8bf7fc3273dbe3cb5c77db829723a39401b00f0e8f70c9f3dba91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/el/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/el/firefox-90.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ca3e4958df9aedc5e6e1f5a9a8778248cc8b3f8b988b143aa2da94a8fbc6b3af"; + sha256 = "2af4feceeea5c0932935d91c22df516ae2e25d9006ab41ba6274783b74b3a5e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-CA/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-CA/firefox-90.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "341f133b3787746993df3e9176601b485bb7a0a16c7a294e7de64f8af39c2ac7"; + sha256 = "e805c2eebe0c9892082b900af2bd1511264ed5fd5d47864ca5a8fc3e6c0a05de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-GB/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-GB/firefox-90.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "13343f3cb63be5c02ee7c8d6883ff473681bff8f55377f74095768c87109f620"; + sha256 = "2d888fdd72a65137790b10f02056d6194fd9c374cc6ff09cf7217cfbb84e2d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-US/firefox-90.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "29fd51b6316d1e589220c2f47e5ff7cdd996cddd450f64ce1dd28ed0e8e4e8fa"; + sha256 = "998607f028043b3780f296eee03027279ef059acab5b50f9754df2bd69ca42b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eo/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eo/firefox-90.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "41c9ed4d9da13fa798e6d75e67b854b84fa0bb76a0771d387a1cf3261838408d"; + sha256 = "3fee8ee742d6ebc03a6fd66404979b7e2fc823757801ac205ca291c249f7b31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-AR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-AR/firefox-90.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8b5c954f4942834a93424b2af17e01f1bcea3d07e1ac404cb205b7b53094088c"; + sha256 = "854cf81090ccdb2f8d4ccf0729c7228c2945626a56d1cfee524f927c5bb67c47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-CL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-CL/firefox-90.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "cdd4eefae21d33263feb67f020e727e4f9d569a49a0311483f24837a19a88c49"; + sha256 = "c0b92a9e2defa74171c880be9ed84f12ab946d4d9af888d7d9ed735114968fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-ES/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-ES/firefox-90.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7cc98380be959aa6375b05b7861e0bd29ab0c2f87824fe0a7a4d0655fb2daf6f"; + sha256 = "a2fcc7126f6c5b6edf162357ddf7493df2873ecbe36d74a176c3924b877c4448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-MX/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-MX/firefox-90.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "52ab52d3c2d92cb7919b1505f1a72a2a066629f1adb45600c08b5f1a7df7b714"; + sha256 = "fd27c822086cfdd3636d1edd0afb62be22546d2dcb86d968ef4e1875acbb66fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/et/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/et/firefox-90.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "aacc5ae2e7750d917e117349183afe8f166f4f51ff7c442f205e119c60faec7d"; + sha256 = "13f34d32f05de7d77d4ffed59a00d539cc819edb3ad9ab52d1a77d9f92a05264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eu/firefox-90.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c6c9276e9e4ac8f34005f6cc6c6fc8d1ec06a25665d9564e864fd77faf0cf777"; + sha256 = "b53133754eadfd473a68b0647bbf3ada70ad46cd0820ffc94b96ca0bd259db62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fa/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fa/firefox-90.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a1253cf75cbb09b9aed574464285360c6f4bae185ca2ec0e4ee28ecbe2582c19"; + sha256 = "048ab2377915cf7efd4daab495873f9c1282f74907bedc22093b0cf17cc3b301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ff/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ff/firefox-90.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e7a13e96f1f231053de8599d1a1b75ffe0d10a2303938ffb74b5bf0ad954da41"; + sha256 = "99de5853888020d6435e8a369eb8b983fe4374e754451dabc2785b9ab2d5bb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fi/firefox-90.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0e7651b6c88fe0308490d716193a16ed6fcfead4f490f299047604c49662a56b"; + sha256 = "03513b1d725a6f5ffa243fe38e19a66c2850d849c09d7b80c3ba17fcb3012b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fr/firefox-90.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "72b35bd4c84d3ea42c40873500177c0cbde37e5ebcbc49c2dc2c5f436d261a15"; + sha256 = "350c5ded72a988773acdb3411f0d9d1ecfdd79501cbc04a9ed8777ada8248ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fy-NL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fy-NL/firefox-90.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "62aa9cb69604233483bd7d510980f4b6a1c96874e98effa9d4179b150f4118a1"; + sha256 = "026a5a3e8140110c830c237b1dee5857d07c9eacd1e803d0f5b054afd0d5d06b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ga-IE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ga-IE/firefox-90.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "159dabccaab426c9aade1379be14874b04ee099752d38bbf0bca5db6b82dc4b1"; + sha256 = "1b522979314c1c672c30da02ea7d38f94ea811df91d86b8327836937069ed956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gd/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gd/firefox-90.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "26b2deeeabf6fb49cd87c138a7c5a1142358db743f2a55468374ad63ff7f60f7"; + sha256 = "d6830e901c20477dd4121cd3a0f918634bc3107d799eaf4439b9ba036acd88d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gl/firefox-90.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "31cd8e5029cbad931492ab3dcc0abf9b194e08292f4ab7876ebf662ab707bea7"; + sha256 = "f25adcd9c7c027a7e531a9072201f174cb69e30c30dffabfff4d0d8e12250f68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gn/firefox-90.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ccdd7ad239105e642a721a44737165bb075f1e6db74733fc2f5b30c863b8222e"; + sha256 = "a0df03aa486320a1fbb554a5be600067d2447af0a63726290f2c7d599c9a9534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gu-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gu-IN/firefox-90.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a25562ca23e69f03f2d6d106afefcf11c5770820aed885a8efbcef001c256fe0"; + sha256 = "daf1ba05f971b8b8f04da9085eefb03ad15fa5bf6d637ad1bcedb94665bb150d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/he/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/he/firefox-90.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e28b51837f7a9c8b8ac4a62bc5b7ac6c834696c8c41c7609b77c9d2807bb05b0"; + sha256 = "cedcbd2e76bf371ed8daefd100631e0381470b3980946e033b39a2b94035a55c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hi-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hi-IN/firefox-90.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "8e6a5104be7e05a58e01acae446294d7459289871213e62e26d59076619f674a"; + sha256 = "d0d6ba66c59fed2c33d9e21c9015b40743ac7e4305b1055f39b909754af984bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hr/firefox-90.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e2d7f357b9574e0892d3cb8672b43ac9532e59c32f9eba0e36bac32d65fb0c25"; + sha256 = "11ba8ffdf88bbaec536e4a362dd40f2eb535edb652fb01587ed46ba09fa7f17e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hsb/firefox-90.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9039cd192bb39e3b4a828fdea48630f8e113f54db87644ecf2b3c84eb8201990"; + sha256 = "d1e1fbba7748ffc2c0f92e4be4dbe346359bc145fa2dc063ed4660d14ffb0b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hu/firefox-90.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "98550b7e259df01476dad15cfe8bb3ec055e1ff57041ae73d09156671dcfdf6f"; + sha256 = "ba8d28151ddd5e02b530b653f5bf5de9dc97669355a8b6370e5067527f22bf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hy-AM/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hy-AM/firefox-90.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "74d34585f9ff86fbd5bf68620964bdad82d7f5b5e0cf7087b12cba3fcc795271"; + sha256 = "df7d7543013687f02a88f9e6d52d4bfbb46c6ce6646bfbbf86571d7473be2554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ia/firefox-90.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "fa705d3b2c9dde9e0cd190e183219f879d72a57f7a1209a293a1bf74cc0a86d8"; + sha256 = "1df0469ba5a368bf5ddd323e68ab458d29042b85e471bb7e20dfccefdf086ba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/id/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/id/firefox-90.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "23bda2ac0b1026bd3443f89e78157cbe47807ae2e0316d68804fd734ed6e196c"; + sha256 = "fee462d383763763a6034a452150166d507d424e303b114b68bb13b6779605d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/is/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/is/firefox-90.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "257dbec349ed5368a10463a1cf1e21d03c1eac1ed3b093a54b1f28e274ec575c"; + sha256 = "86568d6afaed2043d916343c565689047246ff3dbab5e6d928e5a6722f8d093d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/it/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/it/firefox-90.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ff19dbc318739dd11cab9424b5058a6ca8396d6988723a4a3d8b72ef7095713d"; + sha256 = "36e5dc00b8f9bc3fdc91441c0939eae5d43356ef0268c2bebea1d087f5d414e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ja/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ja/firefox-90.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3c3003bf0366ccfe5b6e964720411e06d5622fb5e76ab7f0b2f1d06bb92c8e44"; + sha256 = "b07f66b82be0f6f716384c37286205be455c83d8c9299456376d171167269903"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ka/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ka/firefox-90.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "70b53851ec2b8e512fbafee0d87b0dd32123019c1ed798f4b03b08fed790af68"; + sha256 = "5b391f01586ca70900ce279de8f3e22c670de5b210f350bc8bf82c75dd47e0ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kab/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kab/firefox-90.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "175f112e07f75bda7e42291779655a18601f50c81c84d529874baf3aa1c5bd35"; + sha256 = "a833e4c862c8805d4a1571b210de928f5d4fd6e7973d1de5e7ac1e8e3877b722"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kk/firefox-90.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7aa1edddf9f1d55aa307f8954b0a4043fa8f27243331d97ffb21ccbab4439a3e"; + sha256 = "5041bbd4acba0a2710e705798c8196605c62852de8a1c43f3676631dba5369a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/km/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/km/firefox-90.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "45d013eb6a15558722b9633bbcfbe38c74f20964db716797b4c5358a31596b55"; + sha256 = "f71888db4e4cc49172d625cca26b5b72c6d85180894f29ee0b934781f0f6efff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kn/firefox-90.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "19f7cf799760e51d852981d1217f3303f347631bdc484d44293a85fbe16a2752"; + sha256 = "7d32dee56e657d791eb80e6829ad2ff3624d949531bff1366b685924564d6534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ko/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ko/firefox-90.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c2a1aca33c678e225cc66f1f363f666313d41de5629575bccc3244b2246a517a"; + sha256 = "f9f0781ca8eeb1b21060a3cc2df8f8f5fecd659a230fa4f5f2907db5c37fe6c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lij/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lij/firefox-90.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6645b96ea75cf11afa03d7830fcaeb3cf40ae62a34cd780d703632b04c1c70db"; + sha256 = "0cff9a886e2d158ff00638200106d6537a254cc5a64e48a8233770e5798c1ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lt/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lt/firefox-90.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c4c9b1c346a2e18d813302094c5048b758db64effd0276fb453d77f76a3795c6"; + sha256 = "69c8e5a6f5c3d2435ed6dd02bc1c4b9264b1543b7763ade3accf4f30eea7b9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lv/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lv/firefox-90.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3cd2b96471ce03fcc7ce0217ae68534d0f891cbb21c7c325ff37f02e8a96f310"; + sha256 = "55b59adc86e9e91f5a134bb16837c8843449f4dfc85abbb3f292bb34214bbca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mk/firefox-90.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "95de1a0db3f284e23741f39c9de13acdb2cc8aa3046387f2c923b2fb41ea9e85"; + sha256 = "d670166e34e513ff4dac69740f547542e4e2c3e24f7ae7d165dbe5a4151f17e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mr/firefox-90.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6336fa56e8eaefc5f30934cb1232bc9b4c5a4a1070612026fd4eaaf79a763af2"; + sha256 = "9cd258a90e1a12a113e626bbaa4d557936b29b71491138e73f74ebf6645a9b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ms/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ms/firefox-90.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1efd8100aa12bc3b2c304837b16638bd23fcc1bebbd1b7cdaf8f07bb642eba09"; + sha256 = "0b68ba835ae0f3561eaa2721de08bab95946c1e1111b05f8b02cb7f95bc23335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/my/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/my/firefox-90.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4b9dcf5f8d476ff931a497acfb42747b3b788a031d156b1444126fcece789d68"; + sha256 = "071df9d8ee0a5d1e3b3ae8f472173b5da378b6b41646a3d1d2222a3dbc73596a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nb-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nb-NO/firefox-90.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "81c5973aa829b52c2ebb3ebe35a355bd65c5e803dd5b02fbfcdb58cad56d768a"; + sha256 = "2623cb59780a1db3cc20267023c93f578ad4c6cfede8b12416f538d62ffa930c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ne-NP/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ne-NP/firefox-90.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ca1823de015e593f89a78a578fbf136748ae9e56eeb819773c32fc4d21169398"; + sha256 = "a6c6c514cf476bd93d64c1e315161d765792528a632aa881a75abb85076ac998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nl/firefox-90.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "253e19bbca6cdae42673b2f102bf930531a72a6d67ef3c0a93e2c415fefa18e3"; + sha256 = "60d7de62f35cadc8bab987bf81fe6d8635388b361f3157e5d13809604cc41927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nn-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nn-NO/firefox-90.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "248d44236b2111f0aa8b49ac97e17353740f983448dc0b5085efca9ca1401ed8"; + sha256 = "a1b0cebb8de16685011e5cded38add6a3b13738163dbcf6216182b350c293f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/oc/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/oc/firefox-90.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "85414645c073035536a940f2e2daff958d25213aae01dd5a8617019f5315b9e7"; + sha256 = "f4f491e962ec713e708e9f773de3af9f6251ab6f2f41f516116f83a63824928a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pa-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pa-IN/firefox-90.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9ce28522a04464bec876d301380f991e3543e2eb9fabe294066e23ee1a1ffa87"; + sha256 = "5a41333ed465121d212ddc6c61faf2a5c4eab25daf0ec3206196077f490a18e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pl/firefox-90.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6a05196e0b881ca19ed405cd42d3dd377a22e0cc7788971ca3fb3ddb6da5c73d"; + sha256 = "de5d8c3e5b8f458c400a98c1b72595ff951a54083ff29e1bf01fc3421443cbd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-BR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-BR/firefox-90.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e15e7fee01afbd4b585aa74b5de4efbbd2e30cc4e9e87911c4707760c6a8d198"; + sha256 = "53fb72801cc33ded2e31142161faaca04ec5f7742413faeada30e1c5ef51025b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-PT/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-PT/firefox-90.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f76da7fb580424c0d1326f2daf40ba4f27083447bd7051fc77e6162caadd5292"; + sha256 = "2c72ac24a7cbdb79b338ad9a79f649be85caa0377b78fabcf07c42b1ef02a94e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/rm/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/rm/firefox-90.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "55b0aa8f6dc462190a01f3385ff36cc813fcbd071d0e024c388efd3f247b22f0"; + sha256 = "bfd252411406e6a8816ef000fc6fcff6357741924754daf05ee39ff331bdf3e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ro/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ro/firefox-90.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4d245e0e633e741bf0438603fd0ac76030878bccf69cc28509c018514fbc55be"; + sha256 = "f4c9a173ab7e9fc964f4c255ef9830559fc835d1f18ac388de5fa16d2df5d521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ru/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ru/firefox-90.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5687877a5e8dd4c5eb9dcfbde681f1d6fd9997b562d44592956ecc86024c8806"; + sha256 = "07d1c8cd10323f039a040295230f223e9e6b40860830b2e26a0ab9fd2c15d0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/si/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/si/firefox-90.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4843700d73e84099cbbca968d2d251fbfd012d3230735c22f8dd8e39edb57ed6"; + sha256 = "6f816e89adaabb79ff1b73eed516e6c5f817d7af0ccaee58262ea47c80a08664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sk/firefox-90.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "26bf6c61cf9388f3c0f83362a3f6e744cde8aef12bf48de4e5da0debdd232a4d"; + sha256 = "14fbd3f2057da82c95e2cd194021adc3c7c19b0f64cd56e623ae2341b7414301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sl/firefox-90.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "65578af61cfde136408690f38867b141d48205514398af1b7f2771f6c219c513"; + sha256 = "388ef17576722a32d22350ac2848c8e7f0239481f1d0172441770052bf1c53d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/son/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/son/firefox-90.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "69d59e4ef8dbaabdf86acd7fe413b0fc3532b13cffd67cb0d122c08e72f234b9"; + sha256 = "f7785fc5a91c991c277b36eca1928c350953043e77cdb4b47f25d5f2f611828d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sq/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sq/firefox-90.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d8bc0fab11d1d3641159dcbe0248d1987e6d5a25cb45acde769c3c4632f6364f"; + sha256 = "cc0f348c99304e0da47bbc4be45bc350c53574ea1e20d781f88862e5add4c60a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sr/firefox-90.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7ea2ff12e6df802e98cef89aede582e3c6ee800e51c4d5cd6a9ba6a7aba0e4a6"; + sha256 = "6824091ffb721ff42072798cd72c3061921eb69f85a710c141407f83ddddd836"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sv-SE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sv-SE/firefox-90.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e4924167458d6b1251956de695c610bf311047a2b3cce4cffc3b09bb026c07c0"; + sha256 = "3d86180707aa4f2fbe271e9d8fdf10ef5cd52126648a64e684214f159cbc7512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/szl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/szl/firefox-90.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4904579fff0628ba012f269c9be0123f06fe8d414066fa3f52fd28832d6f004e"; + sha256 = "e49776c7820b51648c8e2d19f5e8073515fda5397adae3302383e9f503240e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ta/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ta/firefox-90.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "9611d0624ea57ead7eb9b889faac6a166a1581c64e0fcf8d89e1ff3c6f43c963"; + sha256 = "d8b32890c9ad376cd9122ae6e80d1dc65c0b8be1e5dd4c7381011b1059dd8bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/te/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/te/firefox-90.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d06b945ee1646a37f347f438dcc5cfc2ca34e520fda7e5119d076a35a1636537"; + sha256 = "87974e3cf5214db7f82244b43a584f3cb11d4ba66ac45dfce1d22f417fd63185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/th/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/th/firefox-90.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4e0f715b9df45ed6e5c469d31e886184ab3712d65ed9b5f09f930de55bac7cae"; + sha256 = "1d65c868936bd174ae9ecac66e1c1bc30e4b1214aaa0a2762dfcda6929eed1ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tl/firefox-90.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ffb9acf1bdc1470c5d077707a38b8b754b638297bdcae51ecd985faed50d0c51"; + sha256 = "115ecf4d90d13df1352637c9ed6d1701b6a9d0793d3487d582b90d487e27b52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tr/firefox-90.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "58a4e1b95887aef20744113cc712961cd331afe7b32c9fce9ae95cd10036a075"; + sha256 = "d66f4114e577e945abbb1b32206b2cddff65db1f9a2b1cbd1c8a11e528ce656f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/trs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/trs/firefox-90.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f517e93f9819e008f224078af54c6b080e5022cdfb84ae13e16a65368cf3c971"; + sha256 = "1dc6d43229d0912d34394889deba3d91796ac4aac437b7ed86065d978871fbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uk/firefox-90.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e6f29d8f6e7c92b5c911444c869173a8991bbab60e13c2279c1bb8139bf7d3ee"; + sha256 = "1795fbe577dee1bc042a7b50bceb958446e7f6c95133c2d1432f1494ba86b6a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ur/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ur/firefox-90.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "bcc00d70f7ab06bd024053d5f66d6363f8aaaea65be089bcad99fb0dad2d978c"; + sha256 = "1da88a58d6262c4b2866e765efae0ccc23ff224ed59d5f9a30434a16408b17d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uz/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uz/firefox-90.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "62d8ff68b7c144610c05300fcc8072b832c5ca3ea3b0da3f197f04c1c352114b"; + sha256 = "549956dc6ac0eab50becf7562e91a17fdc3f0244197379f03bbdb2b12f2ecaef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/vi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/vi/firefox-90.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "152b2c3e4b66d5056cf02d6a0d88968da0d2d0d7983ba4a90b17937c752dbc68"; + sha256 = "3e9575342f30b81bebc730c855b54120c95e385edf9273e5355f857da81d55ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xh/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xh/firefox-90.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "bbd12d232fd53c2ca879b55f19abce804ad14da4c47ee11c2723f37f166d69fb"; + sha256 = "d2e7dd3cbd70ef34c53bcfc5b3427508ed368cad548afe0509ff7149a6472ff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-CN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-CN/firefox-90.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "44f71d53e7055b19617b66985f583b44b3d8aa6b63621a8ce34cb2f33e2c35fe"; + sha256 = "a65f4a1002422a07083fb8566e3129f781a8083d9427ba4236812204c953a5f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-TW/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-TW/firefox-90.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "23a5054f37211f0b4637baa7b17c0b41cbf16f8c30cbb7c00d486698a98150e9"; + sha256 = "e5f1c0d36c7a4b3634858d691c5f26481018ac4ce7c5ab7a4c19e04b33810941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ach/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ach/firefox-90.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "985bb9b46a2767f00704f7dbf43ffdf650fa70da1b5c82b66bae9b3ed8e53ec9"; + sha256 = "b5908565dea1f33f82d8e380bb5d648fab9ebcb4af24d602a6c71e176fee5007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/af/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/af/firefox-90.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2b9ac10fca0815b755c89eeaaec3db597bd7eb56294452c715615bcd9edb685b"; + sha256 = "d40bd877e5ad156a45c0c325794537ef9dd71770a395aeebf8381075df0c74d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/an/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/an/firefox-90.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "cd6aa9c8b5e384c36f35c4620954fc29facc9e82600f1fe759bcf239bacd5cb6"; + sha256 = "c72b84b92239955c750cdc302cfed32c7ed1a1352a88b5f599b4edfaad79fdf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ar/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ar/firefox-90.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c6a75b71f6c24f05a92608401b70ce4b3e91f83f7511eeed0b7dfb91ce52ab22"; + sha256 = "25b4175421efe766e7be49591c04b636699bc685aee6459c48b19fe9aaca07db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ast/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ast/firefox-90.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ffc9f0b54fb7df8398e5ccedd75902d4872b2b735d79189e2e00bc519b7914be"; + sha256 = "d7919de20cf70de38f03e508b6ac5728b76ceedb626636cfed74c4698ce4dbc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/az/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/az/firefox-90.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3843e554e11c687e9d0676ed9ed06c11cc6eb571287430cbe8ab26b4c2553e63"; + sha256 = "addbe7fa0121dc3643afde905bf33b764d36d49a60ccf6c427ab97ac941ce9f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/be/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/be/firefox-90.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "412e6a776fbf1cd698092bcaafe30a652a8ab35b72e3edf4cffd0b7438c091c7"; + sha256 = "db52de7ce7236110b28322996303e2a07f69b88eb53393aa4ff75dd841b02aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bg/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bg/firefox-90.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "142d1db515272948aa7788403be55080471773d835476a532fd0e44f08a223c9"; + sha256 = "2abe8c91ce73f350e31de13807fcdc48c2621a29fe25d17ed25a2fb8052ce831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bn/firefox-90.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "75531cdc30d0c9173ab8d8113ceb9897373f7808e1019834545f0130ebbb8ee9"; + sha256 = "2b5f6e1bd73eda0fdf69f6d8181b83206bfbcfcb5edb11be12f2a29e6ffd4a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/br/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/br/firefox-90.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "20e76daf7a280c5d50c9a937e409f25aac7f0ee3254f9145605ee00d00316d5f"; + sha256 = "53339a26816934aa1f5edac114844c42b7107326f114ba28818700ae8ee199ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bs/firefox-90.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1bc0fd2a8ec265d59594bb298cdb51f5506b56e40e5dfc0fc66a37e3d4328e5f"; + sha256 = "d49005f911a027a7628f45103ad2e43438a7ec33142f9a5ec7738a8694d071de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca-valencia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca-valencia/firefox-90.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "dfffd0c2b98641944d74486de4d9f08c2e76b30506942021a5263d1238ab07db"; + sha256 = "ccaa99d7eede57e43c57ab2a185a53061476cedb65f37d4659c1e765297c937a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca/firefox-90.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bcf3b78bcb2bd133ad66d551695d372d099d250e01d790f48bbd69b46c07abd4"; + sha256 = "b4df85c3f723a3e8c44d249f12f37bd27eeade4ec802baccf2e82a92e9869002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cak/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cak/firefox-90.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e27cc065df6bc8ff338a34c97d9f6d4825d711b77bf24e5f1d16ca68dffd6f74"; + sha256 = "a8e1244c9904e3f5bada11c33f2f542b6dbb5ccb867f7cc6d5a2d1a99e95c48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cs/firefox-90.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f25b02aecf709edfd75ceb2faa01979e99ea2a88e981c0d3fa5dc118eca77a5d"; + sha256 = "b2cbe665a6b2482edbe29b50036922708e7bc7aaad65ef6d91b47beb4f53acbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cy/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cy/firefox-90.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d9f09d6c812740f077234dcd5f7caee7be17569526b215d4ebb7d987b8915b47"; + sha256 = "5e151c341812dcf8bdf769ba0a1ae9ec03b3e79d5f55fb18241ab0ef907538fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/da/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/da/firefox-90.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "604342f07532112ca7ad6c8a1d6194dc1487a3f0a05c9785f4d252d6359996c8"; + sha256 = "ebcb60a77185d17114c26d58a61a3a3ef5198709c43133263efbe39c05275dcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/de/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/de/firefox-90.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c2383d7801ff0fd4a111c49d82d7b41f140f1974d20c8bcbfc745b76a78f24f4"; + sha256 = "8819ad2efc7d49946eed2adbb10280602d0004722207cb46e06f46f4fb0f80d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/dsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/dsb/firefox-90.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9972aef81947ebcd09349776a01f7335c41971ac72d2ed806cfd384831b35623"; + sha256 = "c91e40aed7b1c1c41ebe0cdf77e46cb284d7cd308c6ae66a70f46fc4dab008a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/el/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/el/firefox-90.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "942285c706c4321dc6c4578e665edc76523e46f98aa89521f4276bdb2736f610"; + sha256 = "f9032320f0fd0622c9e6ad048de12533e92660bf56e255d2f79fc0c2adc3356c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-CA/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-CA/firefox-90.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "71b236a224823a13ea1b0f144217a735e76c4d25b2725591a5aaea068d1a9808"; + sha256 = "9224c71771b26085f067acd29993e48aea66a61c7ae193bb6442569b9291677a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-GB/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-GB/firefox-90.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1c9f4c7b35faa87d7c1b046abd629e2d4305ff8769f986a4e1def8e381a0ca94"; + sha256 = "fd27cadfa31f81d7103f867aea3efb6f03f341708c4ed93df5d6d8fba601c1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-US/firefox-90.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f983e7537f54131697366c0926b6aad8045c2f1e16c78a0d5edb392d214e535f"; + sha256 = "1043cc2125aa682953340fb40b721b3dcffab1ad0c06184fc5a92740638d4a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eo/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eo/firefox-90.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "90f713f53326849e1b41c7aad160eb5828e4a06f2e9f11918ba61b9ec4d29fef"; + sha256 = "1dd42f52563463c146ddef224f97b6e87f82f01249f7bea290a4cb8331dc9fde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-AR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-AR/firefox-90.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e9abf48307351d5461086d34cd765dcd5af38eac50dbaf3833ddcdd5432908c8"; + sha256 = "fae114afacd99e045abad6dd5a6d4ad5669b00158431ea8458d48e43aa06d4af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-CL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-CL/firefox-90.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "04797e8c12c08eb25f8048f0a653380582cff4f193d03e8e6d3e0d66cf1e59ea"; + sha256 = "1a4b839f8b55ef758c56ce18770cc31e871278e58f378fa7e7cbf4502e3b930c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-ES/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-ES/firefox-90.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1f655463e919d3546a841e86e3aac0bb6b4bc3482153a24d6afaf4eb4f09db0d"; + sha256 = "cc21e66b7c7250d57067c8fc133a8b6f4a4f4020474bb7d4510c94ca02c316c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-MX/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-MX/firefox-90.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3e9b14809de0df3d1f5c0d7bb83f9a769fb5852194511b1cfc33275ca1bbed41"; + sha256 = "cfd89dd866f633359c57af8915586abc7d3bedcf2523bf60f7878d70417c09db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/et/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/et/firefox-90.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "918f284c60618404b7f8130b7e14a57d4ca483adeb6007a79422e6fdb7908114"; + sha256 = "6e678eeef5ebe30b6005533e69ebbc4f096e3a1e2fc07be8c8f1cf3d1b5c1b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eu/firefox-90.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5f682f553356652d92684dff3f8385d1d675539d6cb8b155f12874682c0de235"; + sha256 = "4fcab02f0a755db4baadd5e04fe9589226b0082768ef58e32680a72a86ef52f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fa/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fa/firefox-90.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "5056f42eaef5f5538bfa9af23e123bf9f0a0d370d6fd7848dcdbc50d0cf61d92"; + sha256 = "bd7500a850ae6c4ea9702521716336bd2809c8e3fc058ea021ee27a1b6d40aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ff/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ff/firefox-90.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "cf58279f578ef725e2b89ed4a89021a811b3e237d46d02c7d98137fef3775318"; + sha256 = "76b4327258aedc72fcae8b56dc5dd0c99952f0a2021252c5d0e36d1366b68016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fi/firefox-90.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "28bd2f67ae638fd602adac6327fe51ebf90ff52c8695e8c8ff4161d6bc20be2b"; + sha256 = "4500cd834525149ad46b94a7b86ff776511f3173a48064ed88d6b2e67596dc68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fr/firefox-90.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "53b69cbc6cd3097b67537979637614a6bcc01450426883b7d35a8de5df6647ae"; + sha256 = "85313248992ddcc04bc5b72802929a2c601daae07d5e6d8a11c762159caecf86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fy-NL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fy-NL/firefox-90.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8ee8e11a845a2e2b0f9d12d95f8dcc6b58be2722a68f1a8707b0c1f3a66f90d5"; + sha256 = "ba0d003e88355027ccf1be545555e68e06a19e11b7090844707e0053796f2a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ga-IE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ga-IE/firefox-90.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "39a2bbb6c9a3b3a0ec2c21eeb9f919a54502f891834556ee439704af3705f3fa"; + sha256 = "52f94cb53101e4d2564cb4f4589cb2246a4c78314e38e3d566290adf43f40e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gd/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gd/firefox-90.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b667e68662d81518f03ffa0bab538d4601457b6b1eab1f51dc0be3752855d5ad"; + sha256 = "0998440173e3b5886ff3a356a79fd05e7ea113cab4582a9400abad44ecbf6c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gl/firefox-90.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "65e9376490e6ee833312b99aa7d8f730495f8320e14203a8d6cc7a94e83e6adc"; + sha256 = "6ab3ef1a97c8382160420f563c814f14610f1a0d4565ef8f86b8c8ddbf34e162"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gn/firefox-90.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "45f3da559b51c5ec300ac64f8d5f0e7583c55abfca4c22e72994f65682d0717e"; + sha256 = "f57a5d2ed2b9eb8d35b9bbbb9f76a988409db09c7855d6cb93abf151f8e449c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gu-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gu-IN/firefox-90.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "db1394cf1c52fc0eeab116d49fff3bbcef07f64870345490a1f46f3045268d94"; + sha256 = "eb62873a8c7e2b5b706cd0033b5042a4f4496c265f7e57e1c65f23e3fc896a6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/he/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/he/firefox-90.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "52b49a0014fa2aad266f2503b6e455310d37af0d93102f22404b303de6afe772"; + sha256 = "6c22304604f9e93153d55251e31bb250168015a4ac6c3d93cffcdd9c64ece7e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hi-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hi-IN/firefox-90.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "59484d61d3d4802f9389d668f6125299ba072077a87a16d9b09f9780e975d120"; + sha256 = "155f425d7d9b867acc7035d1220f60148fb94c25dd51ee7049e9c2e9b096a0fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hr/firefox-90.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "292ac6975f6319c0b4274fbe64bd9512a8361c254f82c079e8ac75c974839316"; + sha256 = "96faca700f49d3f8d9337f0f4f820f8a5a6335b06348b835bd39a26619e4efdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hsb/firefox-90.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "81bcc94349b7b83533b5a60d3f8bcef9b3fd0d85628ce0f043013a4c7fe0aacd"; + sha256 = "42ce59b460cf94705f88b80c91705bba81142798803bb1d7a3a0bc34dd96a7e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hu/firefox-90.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1c5867bd108e9232472ccdec0bc24a6558d9a5a6d9147d0c44a4fba2c44ae01a"; + sha256 = "804db507b43af04716bbb4d53525aa9b2958b1d3ff08b93812f1d78531eb01da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hy-AM/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hy-AM/firefox-90.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "de35f4653730d253e5bf147e65ec1f8680ef1fda008f785eb3e49831a00d8b4d"; + sha256 = "488e6bdd3d36490a33d5794f5ede500bad29cd2014cdd50ab5edf74c829fd424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ia/firefox-90.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5ea51c02e6f41291da5840d511bf4ad743e475d6d35fbbfa76c4df3e8f45fb50"; + sha256 = "fd3f22e1247b394b654c12aed384c515a390e91651bcc66f3823205c67951287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/id/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/id/firefox-90.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b9ebc450eb9097902f13c7c30e45a361ade71b99b273d0da898301d3e9bdae36"; + sha256 = "2a197f4f2aa069b888ad9bfaa54da1b3bc461309a2f0475c298b7e501f06e6fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/is/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/is/firefox-90.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "64f7480703eb13e9ba4f12615bd84dead1322d139af1115813b7ab8e6819190d"; + sha256 = "b215c19156d129ef30c2d5b30d723d3923e57658888736bd31d3c7fd4a30f835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/it/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/it/firefox-90.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3f314ed7442d57345d6d1b368dd55bb9e2dd966e269e56d5ea2abfd9140aca67"; + sha256 = "f94a4ddd3278993c80e776849cd52721f40a2808a41f37c74f34ef4b7deea972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ja/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ja/firefox-90.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7cbd06ee69dec66522d35163427f8034bd3ee928aa6bd3c5203f3c9a5e526018"; + sha256 = "4b22759406f177c98ee2496ff17de565f87a0f566e3759ce030fd757c1555e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ka/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ka/firefox-90.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "81575f637a65d1d31503967b380b3337a8af532d5ebd3bc7d35026c37831d50e"; + sha256 = "7e602c099b680f1da42030067988f818e954ec4b02ddc6ec5473e02402a06428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kab/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kab/firefox-90.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bb84536e819cd77b4d45786982384821b7d08dda48fc8fa3f0e12e90e75a688e"; + sha256 = "92d0441b33b179d515c88711bb13684e37c748a938d818723256092930428dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kk/firefox-90.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ced99ad16e7b84fd1c344ff2ad96715e0654ed6cfa0cf6379179bdabf5cb0443"; + sha256 = "50a44e34e2a12ba6357f62bc82d9de9c5250c6e3b5635c81724d0a96f5111436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/km/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/km/firefox-90.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f2641008a2bfd95467b274419d4305014b8b3e5c75622d30a46c5eb9ad761990"; + sha256 = "de8bddaf5a937bfc5bc21897cf95b3d40068133df4c9edfe7eb9eaf76d23e17f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kn/firefox-90.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "5bcda92360ae86a1ed015736847e7d43eac239a6bd995fc932259f169a7f3821"; + sha256 = "86e88fbc62e131f6b6a599575f5c507385251e7d03a114b61e8c1b78c4a8c22f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ko/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ko/firefox-90.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5be9eaa06a7e35b1d401643601ac7e212489609c52961303cb8fe054bf698190"; + sha256 = "10e0169e337cbef4a33e227ea57ff517ec570997fc471509ff95f098cfb52b12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lij/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lij/firefox-90.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "01baf23ab6d89adb3eed47b9f216a0b17b8bc8850b10d09c2bef10792fb1d76a"; + sha256 = "3e054180575b29c5afb286f6d7e8453bc8d4bfaf1ff5d8ac5fc53757b9dc48f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lt/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lt/firefox-90.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a5f8a4fa438fe054d1e8d09ced0079673bc25431aa9cbc6b36ca2e5a1dc58d72"; + sha256 = "79685f8b0d646dc6fb446a85808e22107760343a63be429551866a22581106da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lv/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lv/firefox-90.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8ed19c630ad2cabdd374d2499ddda0ab8993a79c50e7e6728081a6842d1f68d2"; + sha256 = "4df1044be63e35775c89005cddba209760b169be29a3e49d3d29bc370b11dacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mk/firefox-90.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "cb497f4b8f1766afdeed4e351a597bd1da4376c78cdb4172d4815c055583ef4c"; + sha256 = "8040fd3637b5e25215e1e50cb74b6f25736f78d610cc862eef08b5a7e4905f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mr/firefox-90.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0e03049ef7efb5c78963b4f718a61469cb6b1931313ffb50d3e4484b6cf14837"; + sha256 = "49b9eddd2dff87a631ad143e66019d52574ea16b136956e4da473fcee4b810ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ms/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ms/firefox-90.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1a92300fdd218d1fff96388794cea650371c0b1da72b20b22d6deaef7a794c24"; + sha256 = "629d480a6cc207b558cc2aff169225ec636c3d5656b0d04d34b60f8235151bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/my/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/my/firefox-90.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "066061e09aace32d8a7a67499a75aeb143ef1e474e8ce37131e6c37472704169"; + sha256 = "25b330fa564734cd9ead80a58a770a6453d64483cd448dc8ac93e70a2a06a04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nb-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nb-NO/firefox-90.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "12771de667402fc8d8d782ad1b799cc20974f2ee6dba8db87b39f319e6752dc1"; + sha256 = "4d2a0b7101197a603c136b7476e6887d6d9731bbb62e5176ad9876039cc7e166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ne-NP/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ne-NP/firefox-90.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d2d8610eb11fe1aeb948a2ad2b580a396450c92458a9b4cf6cc2b3b051e6b7c1"; + sha256 = "74c9685da27d362a2729303ddf451f684be097d3ca74bf3596585a869921a881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nl/firefox-90.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "99c76cd723c19c6a2192de4f588557060284185047e4597c067e35ba623f01f4"; + sha256 = "a10dc5b62f058d71b3dbd8cb12083fc583528b1642d4f2bccce0f1a422147c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nn-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nn-NO/firefox-90.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5e25d25ae36bbe8346aab027ad684fee3766a1b79c9bf86a370b91e36ab417b9"; + sha256 = "479c022dbadf9b10b2c37577199c3f4df714501502bc894c63efde9358b59745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/oc/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/oc/firefox-90.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "462c07c7a8864711c0309fa0847bbb993eee518508dbb5614571f994f2241099"; + sha256 = "3b702fcd7972cc48151498783e8d0129766fa7adef311369acdba7902bd08f19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pa-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pa-IN/firefox-90.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d1b1f53ed3aa7bd139541e249f29e6672c30d5f88eb980be793b6c6622338eb0"; + sha256 = "69727d81e5dd911bfa426f3f66385caed061e3b22825eeea270925e6d7997a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pl/firefox-90.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b63144adb425b8477f3b8c9026ea3a1168fb3af513d25d5594b810a0aa4be831"; + sha256 = "29d59a753381aed8fd4838cf6da0a43389b1dd408988ffd4e97ec3262c1ec75a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-BR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-BR/firefox-90.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "218108b556c88c9d4ce6f0cc37b3b45dd5b03e7beb591ba0c52aa257d17c54db"; + sha256 = "6ca5bf042fc2a94dd229303cec352ec797e8494ca58b12a337997b8289dff78a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-PT/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-PT/firefox-90.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "96600b7012300cfea1ede41e2c3ac9756cac3981691908e8b2e7c2624eca2d9d"; + sha256 = "50e682cf9bff2b4202ee4c9e64d5efcca66acbcb74d4074ae5d571875cd0f509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/rm/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/rm/firefox-90.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "93bf70fc04f53f779335db31a264a0298188459aa3687d15c7b890199dfd76fc"; + sha256 = "983c8fb011f348b6de1665b1347cdbda23fe130ea33c7c58a49cd417d0419cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ro/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ro/firefox-90.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "bd38c728d06513f3b8fc0ebcfadce3e3029a5779f0c745085d52d823075f0266"; + sha256 = "1f2ff5fe5d65f5f143e89e258a247291d10c25ee2270607250817187353bafa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ru/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ru/firefox-90.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "abc35efade33dc03e6a4ce093d5995e79daea3383c8a4a4b63d83f8336ecfad1"; + sha256 = "3a2f872bcdd7736c1e528d306cb9409826c4958d1e8aea627ef0e2c26b7d8889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/si/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/si/firefox-90.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "201dd56f43db3862243b41fc5b41eefba737d91a05826d50e922f206bd6f6906"; + sha256 = "cfb67ee121130d9ea92af43e33751c31f778f9ff6f9beca2dc609ef5340f09b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sk/firefox-90.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fa5b0d2d00c146ffc0fafb760e870db3133d9b387d383f34099e7e5446986169"; + sha256 = "c045f5c48e3f3f9b20229e744b85920e47e3858f97262ab4d3a8fd61db80da40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sl/firefox-90.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "84900580af3f7b7b10481f6acd42bcf30b98ffa5af3b80cc020f4217a150252a"; + sha256 = "ae3bf5e327c4f4fb7a36b8367539de466acf8f60f40e9deee3bd4928959f0111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/son/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/son/firefox-90.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "122f4a2f50a5bf38e59fd7ea1fc5eaefa8f4dd55a603220a272a32252d6b7c80"; + sha256 = "a7d7f7d1ffdc9126f04f8f96001bce26d21de0e0c65dd1fd00f6f85f75976ba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sq/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sq/firefox-90.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b829a9b18ca57b53b029841812ce6bd4400f3df60d71980258b9a8e7f5b4c33b"; + sha256 = "2982b315ab29ab375d77b1093c53a4a207f36a2d9a40b34aed3376ce96ce5dbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sr/firefox-90.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "523bc6ed11bd320067361f8be81b0c0793618e376be9a8ef1a7a513b544a279a"; + sha256 = "0a2a702216adf7c98ddb19cebfea886b5d0582523ca64f2d7c8656ec663aaf6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sv-SE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sv-SE/firefox-90.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8c8a7f21fedf76d294a1521f4c786c944498e98567c969c9e1455f6b2a535022"; + sha256 = "dded767dd98cc3725044c988354842086768bf9a35eb316111df96368a95900e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/szl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/szl/firefox-90.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a1530e1ad9eef4cad401d0374db80593a3960feca67715d352aac51c66dc0415"; + sha256 = "4ab8b5112cdfdc051a65b5cd562015bf85e11d5ccc0773111439cd469e175c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ta/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ta/firefox-90.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0d4da9f60ffaa360424e73120a782d0480d52227e8b110a1eafdaeb0e6f47092"; + sha256 = "0240cb3f5357a213f622f1c708e2116db4a4271f4b36135d6614bacdee88f00c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/te/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/te/firefox-90.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "fe7cfd5db5b98a9245fa30a8970a729497e563ddf5511609d7930537b5586f2b"; + sha256 = "83b5ed844b16f6b9108432a692bc0895d733de03701ab800bb330d06796176bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/th/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/th/firefox-90.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "1c1a643ea94193bbb063e35921db54bcb6b6333fa06b2de6b91c88ecb888e868"; + sha256 = "faedac7df604ed9cd321a655d27ebf313c08b085c4eeecc310a94c3afd979b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tl/firefox-90.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "89ec5b3f116c6e86bc8e003548c9be2772b7d46c86233b87e96b579d5d7d8851"; + sha256 = "5abdce18c7b0e53f5efd00aa0381c6e90f669c51dcb4c021128a0e7a0a86223e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tr/firefox-90.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "03a367c5f7b52a8e8e863ea108485dafc0232e5dea5da538a3a632e8ae5de454"; + sha256 = "92fd9bb4aef9b723b00cb84ffd253b81d5c86b2bfcefad93e948e443d871bd95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/trs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/trs/firefox-90.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "85d3ba651e9f39a76f2ef1d92d6ce34ed792f6477848b7e75a806c699c72c3c6"; + sha256 = "291c64e95d8accc64fd83738a9b7060122e713786cbb360acbd26b5ed0dc3793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uk/firefox-90.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "90649b7b2cad702b53b7b63fea7e72e666bad605841887bb42d69d487a561678"; + sha256 = "163de4dd52684912f794c1f9c35b003f9cd38acf1be3bc68f42b2da9c1e13fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ur/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ur/firefox-90.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9b9c80716edc99a3e0b7bec2da38a7391798d401734fce4d1bee60f0c71a18ea"; + sha256 = "72ebffebcaf8848c5a9cfbc6c9e33cd1a7bfd62b7689f938065730249506a6eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uz/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uz/firefox-90.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5b154b4f8c036ed7c62bf123e0802f2318cfede67bfafe9aa86cda7b2650a2b2"; + sha256 = "f9c56e6adfa9a0e7289e2a80f88869ebb1556843c940574cfcba4295aac464c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/vi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/vi/firefox-90.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8c3b943e33a1f33086fcce734e183dcf96cd29be0daedc1b4a1f4cd068aaca8b"; + sha256 = "f15136e2e432ae999df5efda82d44c2c61cd680995436cda094bd2fd705e541b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/xh/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/xh/firefox-90.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c43f991777a8fbf8372f1928a465de170b25b07ede53dfb0adc83af18fd11e02"; + sha256 = "360623cac6e11c9179f9c08f2f7f3eb844c3671b8f26a2680e097e1c84896b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-CN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-CN/firefox-90.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "1b8f9f96ee1d59b92b974f9f18639c7e38cd3124c5fb2f9ba7fd44ceb5c532a0"; + sha256 = "f69c7f0fad2bbefbe477ed7ee5414dab2c9ab14e1009970eca07092357cfc7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-TW/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-TW/firefox-90.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a6b520e84e7f5cbf372f1482e4b138a7bf785215776f193e49b30c3860e3625"; + sha256 = "612abc1a9b8b116753ee1417d774fc2ea2f2f931248c57ea93c32ee1c534f9c0"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 8799764fe21..091ca7b4485 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 = "90.0"; + ffversion = "90.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c"; + sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590"; }; meta = { diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 6afdf61886a..2cd3ee11d27 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.2.1"; + version = "29.3.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq"; + sha256 = "1q0w1ffmdfk22df4p2ks4n55zmz44ir8fbcdn5a5h4ihy73nf6xp"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 9a4d61a50ae..9786fad2fdc 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -11,7 +11,6 @@ mkDerivation rec { sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll"; }; - enableParallelBuilding = true; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase ]; qmakeFlags = [ "CONFIG-=app_bundle" ]; diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix new file mode 100644 index 00000000000..fa9b3853a9d --- /dev/null +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, bison +, libevent +, libressl +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "telescope"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz"; + sha256 = "11xrsh064ph1idhygh52y4mqapgwn1cqr0l3naj5n2a2p7lcsvvw"; + }; + + nativeBuildInputs = [ + pkg-config + bison + ]; + + buildInputs = [ + libevent + libressl + ncurses + ]; + + meta = with lib; { + description = "Telescope is a w3m-like browser for Gemini"; + homepage = "https://telescope.omarpolo.com/"; + license = licenses.isc; + maintainers = with maintainers; [ heph2 ]; + platforms = platforms.unix; + }; +} 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 d1830f1c52f..ca57c27ba50 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.18"; + version = "10.5.2"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "15ni33mkg3awfmk3ynr0vi4max1h2k0s10xw3dpmdx6chzv4ll14"; + sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "16lx8wkxli1fzq5f6gcw3im4p8k3xdmnmf6w0p7n8hd8681b1w5s"; + sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4"; }; }; in @@ -311,6 +311,13 @@ stdenv.mkDerivation rec { # chance that TBB would continue using old font files. rm -rf "\$HOME/.cache/fontconfig" + # Manually specify data paths (by default TB attempts to create these in the store) + { + echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");" + echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");" + echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");" + } >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js" + # Lift-off # # XAUTHORITY and DISPLAY are required for TBB to work at all. diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 81c95418e69..3b0dbe8e936 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "widevine"; + pname = "widevine"; version = "4.10.1582.1"; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 69961a2c0a0..8e9d2662ea6 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm"; - version = "3.6.2"; + version = "3.6.3"; gitCommit = "ee407bdf364942bcb8e8c665f82e15aa28009b71"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1s40zbk83s1kylcglydw356282virf1828v9waj1zs1gjnjml69h"; + sha256 = "sha256-DfMI50eQsMHRX8S5rBzF3qlSfJizlYQyofA7HPkD4EQ="; }; - vendorSha256 = "06ccsy30kd68ml13l5k7d4225vlax3fm2pi8dapsyr4gdr234c1x"; + vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index ed4a201db3a..933f1bfe71b 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-Xp86tCIM7XVtue/MjQ8/wGs2fHfxSWS3B6MzNMYRqg4="; + sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU="; }; - vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; + vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 3c69fe05cfc..f3da9705795 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-jzLffTAGlNeglzoJ3AG4d0pwrkXmT5ttJxr2z4MwP90="; + sha256 = "sha256-MHERRJ9t7EG4sd4gevUnZLA25UnRqZprCXFWkp5roms="; }; - vendorSha256 = "sha256-q/m1H6gcnn35ULi+e8fVuJg8eIXhzizGwXJmyf1Hfy4="; + vendorSha256 = "sha256-lzRIXZXrNQOwgl774B9r6OW/O8QwykSk3Mv5oGmvDuY="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 8da48f8485f..89d07da7482 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.13"; + version = "0.24.14"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28="; + sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA="; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index c550a0e2f2b..fec93d8878e 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -1,7 +1,8 @@ { stdenv, kubernetes, installShellFiles }: stdenv.mkDerivation { - name = "kubectl-${kubernetes.version}"; + pname = "kubectl"; + version = kubernetes.version; # kubectl is currently part of the main distribution but will eventially be # split out (see homepage) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix new file mode 100644 index 00000000000..3d277163884 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubedb-cli"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "kubedb"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-CwAa2YqJ0R+L+VwxqruQmZJUctP4GgKszY49ZVyyNBE="; + }; + + vendorSha256 = null; + + # Don't compile the documentation stuff + subPackages = [ "cmd/kubectl-dba" ]; + + meta = with lib; { + description = "kubectl plugin for KubeDB by AppsCode."; + homepage = "https://github.com/kubedb/cli"; + license = licenses.unfree; + maintainers = [ maintainers.starcraft66 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2dfbac5c5ac..2a66b391ae8 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.21.2"; + version = "1.21.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-GAX8ODjGj5LM44KgJC0N5uuOH4z33lDWoQgImOl8/xo="; + sha256 = "sha256-GMigdVuqJN6eIN0nhY5PVUEnCqjAYUzitetk2QmX5wQ="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 0c8f7f1574c..dfa06cc6968 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, fetchFromGitHub}: buildGoModule rec { - name = "kuttl"; pname = "kuttl"; version = "0.9.0"; cli = "kubectl-kuttl"; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 9bd9a8e7a18..883d16319b1 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.2"; - sha256 = "sha256-rEO84t6znNb59a9i+SHgT4r0xzja6eMYi9lWmdU24Cc="; - vendorSha256 = "sha256-esVy+oIZa/ucvucdNV7MfUGFkIql9T2zl0+eu3hZAt8="; + version = "21.7.3"; + sha256 = "sha256-fEkqZ/4BQVnmOKUrrLmi6DKlMVNeqvW95bxbZX0o7iI="; + vendorSha256 = "sha256-NqOmmeEGWvy/LYfSpIdnJZX4lGweCgiL008ed05XIFs="; }; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 418f3259178..4909d734ff3 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg="; + sha256 = "sha256-uYiGerxZb5GW1dOcflERF3wvgJ8VOtRmQkyzC/ztwjk="; }; - vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA="; + vendorSha256 = "sha256-kGSibuXutyOvDkmajIQ0AqrwR3VUiWoM1Y2zk3MwwyU="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index ded8a2ea493..a4270fbcea3 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, hadoop, jre, bash }: stdenv.mkDerivation rec { - - name = "pig-0.17.0"; + pname = "pig"; + version = "0.17.0"; src = fetchurl { - url = "mirror://apache/pig/${name}/${name}.tar.gz"; + url = "mirror://apache/pig/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd"; }; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 26967b7ed85..55f1a5a2c09 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.10.5"; + version = "1.11.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-+rU/Tn3k/VmAgZl169tVZsRf5SL4bI9r3p1svVfKN2E="; + sha256 = "sha256-upoWftm82QBdax0lbeu+Nmwscsj/fsOzGUPI+fzcKUM="; }; - vendorSha256 = "sha256-jbQPhGfZPPxjYTSJ9wMLzQIOhAwxJZypRzqwL421RfM="; + vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI"; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f7eb378e716..cc46bf16ac7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -728,9 +728,10 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v3.79.0", - "sha256": "11n2v537zniiv5xvhpypqrm09my8zybirvq4ly94hp69v73xj89c", - "version": "3.79.0" + "rev": "v4.35.0", + "sha256": "12acy39cr6pxq8gk483b6i78x463ml9pk10qp9jpz0dr05zcyhqw", + "vendorSha256": null, + "version": "4.35.0" }, "okta": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index c255ccd1ef8..8d13fab793c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,9 +195,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.2"; - sha256 = "0gnv6hajpn1ks4944cr8rgkvly9cgvx4zj1zwc7nf1sikqfa8r1a"; - vendorSha256 = "0q1frza5625b1va0ipak7ns3myca9mb02r60h0py3v5gyl2cb4dk"; + version = "1.0.3"; + sha256 = "0m7r66nw0nppra90sjhbq5d0f4q525c73q6ncmy6w37j2nixz35z"; + vendorSha256 = "07pzqvf9lwgc1fadmyam5hn7arlvzrjsplls445738jpn61854gg"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1717d320900..589164e2769 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JRIwPOExPbwLS7ps4pJpvIRaZ9jZZjVK+POaUHAmiPI="; + sha256 = "sha256-vc3DGYb3vp55LRguhg3nG5zH7w1lTFEI2bx7kNffvas="; }; - vendorSha256 = "sha256-lck4nabDhFA8N0lo+cIKiJjlg2TGx3qMExbblHQwbvQ="; + vendorSha256 = "sha256-lBhLaYn8adgfCXQJBsIVuwnA0vY8+tgeqE+C669AV+A="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 69f71a7479e..494a40c6bfe 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fYQqH/J027XJPML/qKMpuu2Nxuvb0cyjOu2czLH8SoM="; + sha256 = "sha256-ExpwJ4lMrYy1WztYo+RYa9jb8slIa3IJk/SUKA1fBKI="; }; - vendorSha256 = "sha256-225TR9jTZSGEJZz3csl/pR/v2unUK67l08x5ESQTJzA="; + vendorSha256 = "sha256-IXA4YNdWR6DWIH4ceif2XcAdwnMr2kCuG3ozagtzsgo="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 66b1d2639d6..07854f48fcc 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --replace "bottle==" "bottle>=" ''; - nativeBuildInputs = with python3Packages; [ pytestrunner ]; + nativeBuildInputs = with python3Packages; [ pytest-runner ]; propagatedBuildInputs = with python3Packages; [ daemonocle dnspython diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 5f5594c0537..a88ff36a8ca 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -10,8 +10,8 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; }; in python.pkgs.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "gns3-gui"; + inherit version; src = fetchFromGitHub { owner = "GNS3"; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 26ae9e7a581..dc40337bd72 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { - name = "daq-2.2.2"; + pname = "daq"; + version = "2.2.2"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index c5a718c3a70..4ecc449fe85 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -5,10 +5,11 @@ with lib; stdenv.mkDerivation rec { - name = "bitlbee-3.6"; + pname = "bitlbee"; + version = "3.6"; src = fetchurl { - url = "mirror://bitlbee/src/${name}.tar.gz"; + url = "mirror://bitlbee/src/bitlbee-${version}.tar.gz"; sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 5d3b251089c..1b6bcd6758f 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.0-beta.6"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A="; + sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index f1e335133d7..e554f631920 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -2,19 +2,19 @@ buildGoModule { pname = "go-neb"; - version = "unstable-2021-03-24"; + version = "unstable-2021-07-21"; src = fetchFromGitHub { owner = "matrix-org"; repo = "go-neb"; - rev = "b6edd50d6e33de3bcdb35055fa6c5f0157f45321"; - sha256 = "sha256-wFqkN4C0rWzWxa6+/LiHMMS8i/g3Q57f5z4cG2XZQzs="; + rev = "8916c80f8ce1732f64b50f9251242ca189082e76"; + sha256 = "sha256-kuH4vbvS4G1bczxUdY4bd4oL4pIZzuueUxdEp4xuzJM="; }; subPackages = [ "." ]; buildInputs = [ olm ]; - vendorSha256 = "sha256-sWrLWjODf25Z8QqCDg4KyVWmTc3PRiYpRL88yxK0j/M"; + vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index fec5462c47a..3474e572931 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}: -stdenv.mkDerivation { - name = "gtmess-0.97"; +stdenv.mkDerivation rec { + pname = "gtmess"; + version = "0.97"; src = fetchurl { - url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz"; + url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz"; sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0"; }; diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 4918a4d91f8..ced0c77a96a 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-07-04"; + version = "unstable-2021-07-17"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "5d3cddc47773b49d4a801d031c1de96c38617908"; - sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad"; + rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158"; + sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index aadb18606e1..7e88a77193b 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,6 +1,6 @@ { lib, fetchgit , buildPythonApplication, buildPythonPackage - , pygobject3, pytestrunner, requests, responses, pytest, python-olm + , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let @@ -20,7 +20,7 @@ let propagatedBuildInputs = [ requests responses olm python-olm canonicaljson - pytestrunner pytest + pytest-runner pytest ]; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index c32bd6f3e39..7a761c1e91c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, pidgin} : +{ lib, stdenv, fetchFromGitHub, pidgin} : -stdenv.mkDerivation { - name = "pidgin-msn-pecan-0.1.4"; - src = fetchurl { - url = "http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2"; - sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; +stdenv.mkDerivation rec { + pname = "pidgin-msn-pecan"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "felipec"; + repo = "msn-pecan"; + rev = "v${version}"; + sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh"; }; meta = { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index c7bad49ceba..52204d5c79c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.2"; + pname = "pidgin-otr"; + version = "4.0.2"; src = fetchurl { - url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; + url = "https://otr.cypherpunks.ca/pidgin-otr-${version}.tar.gz"; sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index 4c7cb2c46bf..d50a3ed5c30 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -2,11 +2,12 @@ , autoreconfHook } : stdenv.mkDerivation rec { - name = "pidgin-osd-0.2.0"; + pname = "pidgin-osd"; + version = "0.2.0"; src = fetchFromGitHub { owner = "edanaher"; repo = "pidgin-osd"; - rev = name; + rev = "${pname}-${version}"; sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index a45f91ec57f..b1078c864de 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -10,12 +10,13 @@ let }; in stdenv.mkDerivation rec { - name = "purple-facebook-0.9.5"; + pname = "purple-facebook"; + version = "0.9.5"; src = fetchFromGitHub { owner = "dequis"; repo = "purple-facebook"; - rev = "v0.9.5-9ff9acf9fa14"; + rev = "v${version}-9ff9acf9fa14"; sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index edc047c78ba..ef9ce5bca74 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, pidgin, intltool, python } : stdenv.mkDerivation rec { - name = "purple-plugin-pack-2.7.0"; + pname = "purple-plugin-pack"; + version = "2.7.0"; src = fetchurl { - url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2"; sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 6ade8e5f19e..cb450aa1bc3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv, fetchgit, pidgin, glib, libxml2 }: +{ lib, stdenv, fetchFromGitHub, pidgin, glib, libxml2 }: stdenv.mkDerivation { - name = "purple-xmpp-upload-2017-12-31"; + pname = "purple-xmpp-upload"; + version = "unstable-2017-12-31"; - src = fetchgit { - url = "https://github.com/Junker/purple-xmpp-http-upload"; + src = fetchFromGitHub { + owner = "Junker"; + repo = "purple-xmpp-http-upload"; rev = "178096cbfc9df165c2dc1677666439969d212b37"; sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix deleted file mode 100644 index 6e14ee1a2b8..00000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, pidgin, libnotify, gdk-pixbuf, glib, dbus -, dbus-glib }: - -stdenv.mkDerivation rec { - name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; - src = fetchurl { - url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f"; - name = "${name}.tar.gz"; - sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0"; - }; - - NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify"; - - patchPhase = '' - sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \ - -e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile - pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify - ''; - - buildPhase = "make libskype.so libskype_dbus.so"; - - installPhase = '' - mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin - cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16 - cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22 - cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48 - cp libskype.so libskype_dbus.so $out/lib/pidgin - ''; - - postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; - - meta = { - homepage = "https://github.com/novas0x2a/skype4pidgin"; - license = lib.licenses.gpl3Plus; - description = "Plugin to use a running skype account through pidgin"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index e7f8a9e7726..9d8a0d68e75 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,13 +21,13 @@ with lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r"; + sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 1851a60216b..58cd952edbb 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -7,7 +7,8 @@ let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); in stdenv.mkDerivation { - name = "ratox-0.4.20180303"; + pname = "ratox"; + version = "0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index daf1c476e67..a46649acb18 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.9.0"; # Please backport all updates to the stable channel. + version = "5.10.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h"; + sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 83cc80ccaf0..417cb4dbb84 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -4,14 +4,12 @@ # Enabling the plugin and using it with a recent irssi, segafults on join: # http://marc.info/?l=silc-devel&m=125610477802211 -let - basename = "silc-client-1.1.11"; -in -stdenv.mkDerivation { - name = basename + lib.optionalString enablePlugin "-irssi-plugin"; +stdenv.mkDerivation rec { + pname = "silc-client" + lib.optionalString enablePlugin "-irssi-plugin"; + version = "1.1.11"; src = fetchurl { - url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2"; + url = "mirror://sourceforge/silc/silc/client/sources/silc-client-${version}.tar.bz2"; sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn"; }; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 39cff6de85d..24282f4be33 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -50,8 +50,12 @@ let x86_64-linux-version = "4.17.0"; x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi"; + aarch64-darwin-version = "4.17.0"; + aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46"; + version = { x86_64-darwin = x86_64-darwin-version; + aarch64-darwin = aarch64-darwin-version; x86_64-linux = x86_64-linux-version; }.${system} or throwSystem; @@ -64,6 +68,10 @@ let url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; sha256 = x86_64-darwin-sha256; }; + aarch64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + sha256 = aarch64-darwin-sha256; + }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; sha256 = x86_64-linux-sha256; @@ -75,7 +83,7 @@ let homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"]; }; linux = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index deb01f1ef22..3b1775a7ba8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,10 +2,11 @@ , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.18.4"; + pname = "telepathy-gabble"; + version = "0.18.4"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-${version}.tar.gz"; sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 11acf05c19e..27df1273c08 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "telepathy-haze"; - name = "${pname}-0.8.0"; + version = "0.8.0"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index a6b1a5256f4..ad7a588d9ce 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -2,11 +2,11 @@ , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { - project = "telepathy-logger"; - name = "${project}-0.8.2"; + pname = "telepathy-logger"; + version = "0.8.2"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + url = "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-${version}.tar.bz2"; sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 38ee5579b5a..882fae1c3b5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "telepathy-salut"; - name = "${pname}-0.8.1"; + version = "0.8.1"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz"; sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 5bbdc6460c6..172d11f6b85 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - buildInputs = [ qtbase qtquickcontrols ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index e97ea7bb65f..b2f80c70d24 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook - pytestcov + pytest-cov pytest-mock ]); diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index a4a1b3405b1..6e3ef93ec77 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.7.0"; + version = "5.8.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0yfr0n84p3jp8mnnqww2dqpcj9gd7rwpygpq4v10rmrnli18qygw"; + sha256 = "0z8lp56j6qvm57sfqdyqrqzj9add3drh1z4zsckg45jfw6yn3jdv"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index 344af6a0312..2881991bf82 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "iptraf-3.0.1"; +stdenv.mkDerivation rec { + pname = "iptraf"; + version = "3.0.1"; src = fetchurl { - url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz"; + url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz"; sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; }; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index ab698ea9c56..9148a26567d 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ libcommuni qtbase ]; - enableParallelBuilding = true; - dontWrapQtApps = true; preConfigure = '' diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 22d03af0faf..93056ef399f 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ii-1.8"; + pname = "ii"; + version = "1.8"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index d3b814fb161..df59ddec6a9 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: +{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: stdenv.mkDerivation rec { - name = "fish-irssi-20130413-e98156bebd"; + pname = "fish-irssi"; + version = "unstable-2013-04-13"; - src = fetchurl { - url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd"; - name = "${name}.tar.gz"; - sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a"; + src = fetchFromGitHub { + owner = "falsovsky"; + repo = "FiSH-irssi"; + rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6"; + sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp"; }; preConfigure = '' diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index b72e28929e3..7869333479e 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -32,7 +32,7 @@ let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { - name = "quassel${tag}-${version}"; + pname = "quassel${tag}"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 24cf26fbaf5..282603f9924 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2018-11-19"; + pname = "weechat-matrix-bridge"; + version = "unstable-2018-11-19"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 5fcc060ffbf..fe74e922230 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }: let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e"; in stdenv.mkDerivation rec { - pname = "mmh-unstable"; - version = "2019-09-08"; + pname = "mmh"; + version = "unstable-2019-09-08"; src = fetchurl { url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 646fa4e2050..5e9e17b47fd 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: -let +stdenv.mkDerivation rec { version = "1.9"; - name = "msgviewer-${version}"; - uname = "MSGViewer-${version}"; - -in stdenv.mkDerivation { - inherit name; + pname = "msgviewer"; + uname = "MSGViewer"; src = fetchurl { - url = "mirror://sourceforge/msgviewer/${uname}/${uname}.zip"; + url = "mirror://sourceforge/msgviewer/${uname}-${version}/${uname}-${version}.zip"; sha256 = "0igmr8c0757xsc94xlv2470zv2mz57zaj52dwr9wj8agmj23jbjz"; }; @@ -17,8 +14,8 @@ in stdenv.mkDerivation { dir=$out/lib/msgviewer mkdir -p $out/bin $dir unzip $src -d $dir - mv $dir/${uname}/* $dir - rmdir $dir/${uname} + mv $dir/${uname}-${version}/* $dir + rmdir $dir/${uname}-${version} cat <<_EOF > $out/bin/msgviewer #!${runtimeShell} -eu exec ${lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 18264c5c6af..ffd30c754b4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { src = notmuch.src; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; installPhase = '' ${coreutils}/bin/install -Dm755 \ @@ -36,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Mutt support for notmuch"; homepage = "https://notmuchmail.org/"; license = with licenses; gpl3; diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index bc960ac12d4..7cf5b3a7551 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -4,7 +4,8 @@ let binPath = lib.makeBinPath [ which file ]; in stdenv.mkDerivation { - name = "mumble-overlay-${mumble.version}"; + pname = "mumble-overlay"; + version = mumble.version; inherit (mumble) src; diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index b7bffcd694e..43fee635f45 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -10,26 +10,33 @@ rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0="; + sha256 = "sha256-bZXbteryXkOxft63zUMWdpBgbDSvrBHQY3f70/+mBtI="; }; - cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx"; + cargoSha256 = "0xwa114fs4h6y2a3nrl2dp0rv0k336xy9y330g9yix4g34qmrynq"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - patches = [ ./ignore-networking-tests.patch ]; checkType = "debug"; passthru.updateScript = ./update.sh; + checkFlags = [ + "--skip commands::upgrade::upgrade_tests" + "--skip allowed_hosts::tests::creating_a_new_host_store" + "--skip allowed_hosts::tests::getting_the_domain_root" + "--skip allowed_hosts::tests::requests_to_allowed_hosts" + "--skip allowed_hosts::tests::requests_to_unknown_hosts" + ]; + meta = with lib; { description = "A mixnet providing IP-level privacy"; longDescription = '' diff --git a/pkgs/applications/networking/nym/ignore-networking-tests.patch b/pkgs/applications/networking/nym/ignore-networking-tests.patch deleted file mode 100644 index e971557e7ce..00000000000 --- a/pkgs/applications/networking/nym/ignore-networking-tests.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs -index 3026b4ee..fd156682 100644 ---- a/service-providers/network-requester/src/allowed_hosts.rs -+++ b/service-providers/network-requester/src/allowed_hosts.rs -@@ -306,6 +306,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn leaves_a_com_alone() { - let filter = setup(); - assert_eq!( -@@ -315,6 +316,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn trims_subdomains_from_com() { - let filter = setup(); - assert_eq!( -@@ -324,6 +326,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn works_for_non_com_roots() { - let filter = setup(); - assert_eq!( -@@ -333,6 +336,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn works_for_non_com_roots_with_subdomains() { - let filter = setup(); - assert_eq!( -@@ -342,12 +346,14 @@ mod tests { - } - - #[test] -+ #[ignore] - fn returns_none_on_garbage() { - let filter = setup(); - assert_eq!(None, filter.get_domain_root("::/&&%@")); - } - - #[test] -+ #[ignore] - fn returns_none_on_nonsense_domains() { - let filter = setup(); - assert_eq!(None, filter.get_domain_root("flappappa")); -@@ -368,6 +374,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_not_allowed() { - let host = "unknown.com"; - let mut filter = setup(); -@@ -375,6 +382,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn get_appended_once_to_the_unknown_hosts_list() { - let host = "unknown.com"; - let mut filter = setup(); -@@ -405,6 +413,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed() { - let host = "nymtech.net"; - -@@ -413,6 +422,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_subdomains() { - let host = "foomp.nymtech.net"; - -@@ -421,6 +431,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_not_appended_to_file() { - let mut filter = setup(&["nymtech.net"]); - -@@ -436,6 +447,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv4_addresses() { - let address_good = "1.1.1.1"; - let address_good_port = "1.1.1.1:1234"; -@@ -448,6 +460,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv6_addresses() { - let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; - let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334"; -@@ -477,6 +490,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv4_address_ranges() { - let range1 = "127.0.0.1/32"; - let range2 = "1.2.3.4/24"; -@@ -495,6 +509,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv6_address_ranges() { - let range = "2620:0:2d0:200::7/32"; - diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index a6816d042e0..19dba8d5fae 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, curl, libmrss, podofo, libiconv }: -stdenv.mkDerivation { - name = "offrss-1.3"; +stdenv.mkDerivation rec { + pname = "offrss"; + version = "1.3"; installPhase = '' mkdir -p $out/bin @@ -22,7 +23,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz"; + url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${version}.tar.gz"; sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index f08e5c42e1d..ac0aeba9721 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libowfat, zlib, nixosTests }: stdenv.mkDerivation { - name = "opentracker-2018-05-26"; + pname = "opentracker"; + version = "unstable-2018-05-26"; src = fetchgit { url = "https://erdgeist.org/gitweb/opentracker"; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index e1936bf06a7..6cd05a7c318 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -28,16 +28,15 @@ let pname = "pcloud"; version = "1.9.3"; code = "XZh0QTXZIYkI66plpzLAJ4G2mwDvJFvKvEzy"; - name = "${pname}-${version}"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { - url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip"; + url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; hash = "sha256-NFbSYZRysRIg6q0aaDocpK7xJbiCWc1S0McXKlCRGjU="; }; appimageContents = appimageTools.extractType2 { - inherit name; + name = "${pname}-${version}"; src = "${src}/pcloud"; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index d40d8032c29..dfed1f59075 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -24,8 +24,6 @@ mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; - enableParallelBuilding = true; - installTargets = [ "install_client" "install_man" ]; qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 2a91eb35d80..742e6eab858 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libosip }: stdenv.mkDerivation rec { - name = "siproxd-0.8.2"; + pname = "siproxd"; + version = "0.8.2"; src = fetchurl { - url = "mirror://sourceforge/siproxd/${name}.tar.gz"; + url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz"; sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j"; }; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index db54231ecf2..067175bdb48 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -2,9 +2,10 @@ popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.20"; + pname = "etherape"; + version = "0.9.20"; src = fetchurl { - url = "mirror://sourceforge/etherape/${name}.tar.gz"; + url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz"; sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y="; }; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index f630cb4071a..95970a7b870 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, python-dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests-toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests - requests_toolbelt setuptools sqlalchemy ]; + requests-toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 0a74d19dfdb..4b1a0bed048 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.55.1"; + version = "1.56.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1fyi12qz2igcf9rqsp9gmcgfnmgy4g04s2b03b95ml6klbf73cns"; + sha256 = "03fqwsbpwb8vmgxg6knkp8f4xlvgg88n2c7inwjg8x91c7c77i0b"; }; - vendorSha256 = "199z3j62xw9h8yviyv4jfls29y2ri9511hcyp5ix8ahgk6ypz8vw"; + vendorSha256 = "1gryisn63f6ss889s162ncvlsaznwgvgxdwk2pn5c5zw8dkmjdmi"; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 3479458088e..39ce5d3a7ea 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl }: +{ lib, fetchurl, fetchpatch }: rec { version = "3.2.3"; @@ -12,6 +12,13 @@ rec { url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; sha256 = "1wj21v57v135n6fnmlm2dxmb9lhrrg62jgkggldp1gb7d6s4arny"; }; + extraPatches = [ + (fetchpatch { + name = "CVE-2020-14387.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=c3f7414;hp=4c4fce51072c9189cfb11b52aa54fed79f5741bd"; + sha256 = "000lyx48lns84p53nsdlr45mb9558lrvnsz3yic0y3z6h2izv82x"; + }) + ]; meta = with lib; { description = "Fast incremental file transfer utility"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 54417e6ef4b..88304e56a40 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,39 +1,47 @@ -{ lib, stdenv, fetchurl, perl, libiconv, zlib, popt -, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null -, enableLZ4 ? true, lz4 ? null -, enableOpenSSL ? true, openssl ? null -, enableXXHash ? true, xxHash ? null -, enableZstd ? true, zstd ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +, libiconv +, zlib +, popt +, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl +, acl +, enableLZ4 ? true +, lz4 +, enableOpenSSL ? true +, openssl +, enableXXHash ? true +, xxHash +, enableZstd ? true +, zstd , enableCopyDevicesPatch ? false , nixosTests }: -assert enableACLs -> acl != null; -assert enableLZ4 -> lz4 != null; -assert enableOpenSSL -> openssl != null; -assert enableXXHash -> xxHash != null; -assert enableZstd -> zstd != null; - let - base = import ./base.nix { inherit lib fetchurl; }; + base = import ./base.nix { inherit lib fetchurl fetchpatch; }; in stdenv.mkDerivation rec { - name = "rsync-${base.version}"; + pname = "rsync"; + version = base.version; mainSrc = base.src; patchesSrc = base.upstreamPatchTarball; - srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc; - patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; + srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc; + patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff" + ++ base.extraPatches; - buildInputs = [libiconv zlib popt] - ++ lib.optional enableACLs acl - ++ lib.optional enableZstd zstd - ++ lib.optional enableLZ4 lz4 - ++ lib.optional enableOpenSSL openssl - ++ lib.optional enableXXHash xxHash; - nativeBuildInputs = [perl]; + buildInputs = [ libiconv zlib popt ] + ++ lib.optional enableACLs acl + ++ lib.optional enableZstd zstd + ++ lib.optional enableLZ4 lz4 + ++ lib.optional enableOpenSSL openssl + ++ lib.optional enableXXHash xxHash; + nativeBuildInputs = [ perl ]; configureFlags = [ "--with-nobody-group=nogroup" @@ -42,13 +50,13 @@ stdenv.mkDerivation rec { # links them even. "--with-included-zlib=no" ] - # Work around issue with cross-compilation: - # configure.sh: error: cannot run test program while cross compiling - # Remove once 3.2.4 or more recent is released. - # The following PR should fix the cross-compilation issue. - # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. - # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + # Work around issue with cross-compilation: + # configure.sh: error: cannot run test program while cross compiling + # Remove once 3.2.4 or more recent is released. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" ; passthru.tests = { inherit (nixosTests) rsyncd; }; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 83eb4658d2f..e55f7fc1fba 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, perl, rsync }: +{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }: let - base = import ./base.nix { inherit lib fetchurl; }; + base = import ./base.nix { inherit lib fetchurl fetchpatch; }; in stdenv.mkDerivation { - name = "rrsync-${base.version}"; + pname = "rrsync"; + version = base.version; src = base.src; @@ -15,6 +16,8 @@ stdenv.mkDerivation { dontConfigure = true; dontBuild = true; + patches = base.extraPatches; + postPatch = '' substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync ''; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index a72618d935d..562372b1bb7 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -2,7 +2,7 @@ let zncDerivation = a@{ - name, src, module_name, + pname, src, module_name, buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ... } : stdenv.mkDerivation (a // { @@ -18,7 +18,7 @@ let in { backlog = zncDerivation rec { - name = "znc-backlog-${version}"; + pname = "znc-backlog"; version = "git-2017-06-13"; module_name = "backlog"; @@ -38,7 +38,7 @@ in { }; clientbuffer = zncDerivation rec { - name = "znc-clientbuffer-${version}"; + pname = "znc-clientbuffer"; version = "git-2020-04-24"; module_name = "clientbuffer"; @@ -58,7 +58,7 @@ in { }; clientaway = zncDerivation rec { - name = "znc-clientaway-${version}"; + pname = "znc-clientaway"; version = "git-2017-04-28"; module_name = "clientaway"; @@ -78,7 +78,7 @@ in { }; fish = zncDerivation rec { - name = "znc-fish-${version}"; + pname = "znc-fish"; version = "git-2017-06-26"; module_name = "fish"; @@ -98,7 +98,7 @@ in { }; ignore = zncDerivation rec { - name = "znc-ignore-${version}"; + pname = "znc-ignore"; version = "git-2017-04-28"; module_name = "ignore"; @@ -118,7 +118,7 @@ in { }; palaver = zncDerivation rec { - name = "znc-palaver-${version}"; + pname = "znc-palaver"; version = "2020-07-18"; module_name = "palaver"; @@ -138,7 +138,7 @@ in { }; playback = zncDerivation rec { - name = "znc-playback-${version}"; + pname = "znc-playback"; version = "git-2015-08-04"; module_name = "playback"; @@ -158,7 +158,7 @@ in { }; privmsg = zncDerivation rec { - name = "znc-privmsg-${version}"; + pname = "znc-privmsg"; version = "git-2015-02-22"; module_name = "privmsg"; @@ -176,7 +176,7 @@ in { }; push = zncDerivation rec { - name = "znc-push-${version}"; + pname = "znc-push"; version = "git-2016-10-12"; module_name = "push"; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 68032ebe849..74bdacd9584 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -148,7 +148,7 @@ let pytest pytest-django pytest-env - pytest_xdist + pytest-xdist ]; pyocrWithUserTesseract = pyPkgs: diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 5894c6c3e14..fc9f70094da 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -44,8 +44,8 @@ buildPythonApplication rec { freezegun hypothesis pytest - pytestrunner - pytestcov + pytest-runner + pytest-cov glibcLocales ]; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 2dbd9f1aba9..2f31761537d 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -68,8 +68,6 @@ gnuradio3_8.pkgs.mkDerivation rec { gnuradio3_8.qt.wrapQtAppsHook ]; - enableParallelBuilding = true; - meta = with lib; { description = "SDR transceiver application for analog and digital modes"; homepage = "http://qradiolink.org/"; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index 555264ac485..7b27bb2eac0 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -10,8 +10,6 @@ mkDerivation rec { sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake pkg-config diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 6916379bdea..7d90dca46f5 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,26 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib, python3 +{ stdenv, fetchFromGitHub, lib, python3 , cmake, lingeling, btor2tools, gtest, gmp }: stdenv.mkDerivation rec { pname = "boolector"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "boolector"; repo = "boolector"; - rev = "refs/tags/${version}"; - sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci"; + rev = version; + sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z"; }; - # excludes development artifacts from install, will be included in next release - patches = [ - (fetchpatch { - url = "https://github.com/Boolector/boolector/commit/4d240436e34e65096671099766344dd9126145b1.patch"; - sha256 = "1girsbvlhkkl1hldl2gsjynwc3m92jskn798qhx0ydg6whrfgcgw"; - }) - ]; - postPatch = '' sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 ''; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index b5c66289c9d..cd19b9a9442 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -162,6 +162,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; + enableParallelBuilding = true; createFindlibDestdir = true; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 1ca22cf769c..9b3f42dd4ba 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,29 +1,28 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let version = "2.7.1"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "logisim"; - inherit version; + version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; + url = "mirror://sourceforge/project/circuit/${lib.versions.majorMinor version}.x/${version}/logisim-generic-${version}.jar"; sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain"; }; - phases = [ "installPhase" ]; + dontUnpack = true; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -pv $out/bin + mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src" ''; - meta = { + meta = with lib; { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 5ecde839606..419323cfa31 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,20 +2,23 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.5.3"; + version = "6.6.1"; propagatedBuildInputs = with python3Packages; [ appdirs - ConfigArgParse + configargparse connection-pool datrie docutils filelock GitPython + jinja2 jsonschema nbformat + networkx psutil pulp + pygraphviz pyyaml ratelimiter requests @@ -28,7 +31,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d"; + sha256 = "91637a801342f3bc349c033b284fef7c0201b4e5e29d5650cb6c7f69096d4184"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix new file mode 100644 index 00000000000..a25fbe7565c --- /dev/null +++ b/pkgs/applications/science/misc/toil/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "toil"; + version = "5.4.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "docker = " "docker = 'docker' #" \ + --replace "addict = " "addict = 'addict' #" + ''; + + propagatedBuildInputs = with python3Packages; [ + addict + docker + pytz + pyyaml + enlighten + psutil + python-dateutil + dill + ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; + + pytestFlagsArray = [ "src/toil/test" ]; + pythonImportsCheck = [ "toil" ]; + + meta = with lib; { + homepage = "https://toil.ucsc-cgl.org/"; + license = with licenses; [ asl20 ]; + description = "Workflow engine written in pure Python"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 5ae56528f96..85e20f38b66 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -9,8 +9,6 @@ mkDerivation rec { sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; meta = with lib; { diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 0f5e7e6daa8..b65c2352139 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -30,8 +30,6 @@ mkDerivation rec { --replace /usr $out ''; - enableParallelBuilding = true; - meta = { description = "Ground station software for autonomous vehicles"; longDescription = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1b9304d49e7..2759723841c 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -17,7 +17,6 @@ mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland ]; - enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; nativeBuildInputs = [ pkg-config qmake qttools ]; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 60fb743f859..e4c5eb752d7 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -131,7 +131,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ]; + maintainers = with maintainers; [ Br1ght0ne mic92 ma27 ]; platforms = platforms.unix; changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 97812decbf3..049452c7e3a 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -29,8 +29,6 @@ mkDerivation rec { ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; - enableParallelBuilding = true; - meta = { description = "Terminal emulator which mimics the old cathode display"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/terminal-emulators/coreterminal/default.nix new file mode 100644 index 00000000000..e358fae0716 --- /dev/null +++ b/pkgs/applications/terminal-emulators/coreterminal/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, cmake +, ninja +, qtbase +, qtserialport +, qtermwidget +, libcprime +}: + +mkDerivation rec { + pname = "coreterminal"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtserialport + qtermwidget + libcprime + ]; + + meta = with lib; { + description = "A terminal emulator from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 6ddeffe68eb..e922a34423c 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { intltool gobject-introspection wrapGAppsHook - python3.pkgs.pytestrunner + python3.pkgs.pytest-runner ]; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 16f87df678c..a7ca5c4eaa6 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU="; + sha256 = "sha256-6ur1ZIJRghkZk5tLMJUmKn+XfjVGFE0MRSQ/Uz+Eans="; }; - vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; + vendorSha256 = "sha256-JJNyzMYAQT/pS1+eGYQsUpxDiwa6DP7JWhIBuTtnOiE="; nativeBuildInputs = [ installShellFiles ]; 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 3dd241840c7..531d5a547e6 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 = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h"; + sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix new file mode 100644 index 00000000000..650ec73619a --- /dev/null +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, wrapGAppsHook +, gnome +, libsecret +, git +, curl +, nss +, nspr +, xorg +, libdrm +, alsa-lib +, cups +, mesa +, systemd +}: + +stdenv.mkDerivation rec { + pname = "github-desktop"; + version = "2.9.0"; + + src = fetchurl { + url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux4/GitHubDesktop-linux-${version}-linux4.deb"; + sha256 = "sha256-kyzvvzSCfo6uaTA0Z1yqAUjr4A5p3OuIpaVQv64WW7M"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + gnome.gnome-keyring + xorg.libXdamage + xorg.libX11 + libsecret + git + curl + nss + nspr + libdrm + alsa-lib + cups + mesa + ]; + + unpackPhase = '' + mkdir -p $TMP/${pname} $out/{opt,bin} + cp $src $TMP/${pname}.deb + ar vx ${pname}.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/ + ''; + + installPhase = '' + cp -R $TMP/${pname}/usr/share $out/ + cp -R $TMP/${pname}/usr/lib/${pname}/* $out/opt/ + ln -sf $out/opt/${pname} $out/bin/${pname} + ''; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "GUI for managing Git and GitHub."; + homepage = "https://desktop.github.com/"; + license = licenses.mit; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 06a4b2c98a6..5e556b40a89 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests checkInputs = [ pytest pytest-flake8 git ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ipython nbformat ]; src = fetchPypi { diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index aa40291790e..b559a85d44c 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ccextractor"; - version = "0.89"; + version = "0.90"; src = fetchFromGitHub { owner = "CCExtractor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A="; + sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o="; }; sourceRoot = "source/src"; diff --git a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix index 8b91b5e5fa5..9c62198cb0f 100644 --- a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix +++ b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "a4ksubtitles"; namespace = "service.subtitles.a4ksubtitles"; - version = "2.6.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "a4k-openproject"; repo = "a4kSubtitles"; rev = "${namespace}/${namespace}-${version}"; - sha256 = "1rzgrxdcws064ji65fdbzzmgd2pdlaak3apa5n1clkmzknn7n881"; + sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix index b99a64f3eec..1088f560adf 100644 --- a/pkgs/applications/video/kodi-packages/certifi/default.nix +++ b/pkgs/applications/video/kodi-packages/certifi/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.certifi"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.certifi"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix index cfe3d501cbd..fe482447cfa 100644 --- a/pkgs/applications/video/kodi-packages/chardet/default.nix +++ b/pkgs/applications/video/kodi-packages/chardet/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.chardet"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.chardet"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/dateutil/default.nix b/pkgs/applications/video/kodi-packages/dateutil/default.nix index 665858d3d57..54a22cedf90 100644 --- a/pkgs/applications/video/kodi-packages/dateutil/default.nix +++ b/pkgs/applications/video/kodi-packages/dateutil/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.dateutil"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.dateutil"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix index c90f52ffdc9..01f16696fae 100644 --- a/pkgs/applications/video/kodi-packages/idna/default.nix +++ b/pkgs/applications/video/kodi-packages/idna/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.idna"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.idna"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index e3cf4621ca6..784e0f7faf0 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.17"; + version = "2.6.20"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-MHwLTSyMF7vYiVTof3xePW2eOySCr4/xYlPvWSzBZUg="; + sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5"; }; extraNativeBuildInputs = [ gtest ]; diff --git a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix index 1e91c267985..53abde6c3f4 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "1.21.3"; + version = "1.21.8"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-OShd6sPGXXu0rlSwuQFMWqrLscE6Y0I2eV2YJYyZNMs="; + sha256 = "0iq89vfb3p3b5qhivxs95xk122vgmbpixdvqpmkxp19rlyn3z9j6"; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index 4ca45f8b7b9..fcf53e7a169 100644 --- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.inputstreamhelper"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.inputstreamhelper"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/pkgs/applications/video/kodi-packages/kodi-six/default.nix index b4f1169b36d..24404ef349e 100644 --- a/pkgs/applications/video/kodi-packages/kodi-six/default.nix +++ b/pkgs/applications/video/kodi-packages/kodi-six/default.nix @@ -10,8 +10,11 @@ buildKodiAddon rec { sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.kodi-six"; + passthru = { + pythonPath = "libs"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.kodi-six"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix index bd0c98137a5..e39625545f6 100644 --- a/pkgs/applications/video/kodi-packages/myconnpy/default.nix +++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.myconnpy"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.myconnpy"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix index 20317b26828..d9d11657e8b 100644 --- a/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.16.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "0k5jz6zjsazf0z2xv7gk848p4hvkzd79d0kl71a5d20f96g3938k"; + sha256 = "0yycwm8vrpkr4fsbf713mhpnaxfd849nhzp5r1898sb9vldab4xk"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix index 8896a94c9c3..62a5853c796 100644 --- a/pkgs/applications/video/kodi-packages/pdfreader/default.nix +++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix @@ -11,6 +11,8 @@ buildKodiAddon rec { sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; }; + passthru.pythonPath = "lib/api"; + meta = with lib; { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix index 5e7f39d911f..30f5c895c35 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "8.3.0"; + version = "8.3.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "1lqd0kkfv06n8ax8ywsi1rx9glvx3pwi9yj9yb3fdf39xmd3hz7y"; + sha256 = "15gv499r6jf89chp7xpv0z4v0nia907czs83lz57lxydqcbmmjnn"; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index b6feec8ab03..7905ffc8ef5 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.6.5"; + version = "7.6.9"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA="; + sha256 = "1nj4qgr35cw5ly16w2fdgscz5245d7mgvm4sxgxy19jkyv7jmzn3"; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix index 0f2d5044f04..c5759fcc325 100644 --- a/pkgs/applications/video/kodi-packages/requests/default.nix +++ b/pkgs/applications/video/kodi-packages/requests/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { urllib3 ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.requests"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.requests"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix index bba7b112e9f..b66b1e99a8b 100644 --- a/pkgs/applications/video/kodi-packages/signals/default.nix +++ b/pkgs/applications/video/kodi-packages/signals/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.signals"; + passthru= { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.signals"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix index 12d8e60d67b..de0fbb99765 100644 --- a/pkgs/applications/video/kodi-packages/urllib3/default.nix +++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.urllib3"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.urllib3"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/websocket/default.nix b/pkgs/applications/video/kodi-packages/websocket/default.nix index 3c83e1f9b00..423dfa73f34 100644 --- a/pkgs/applications/video/kodi-packages/websocket/default.nix +++ b/pkgs/applications/video/kodi-packages/websocket/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.websocket"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.websocket"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index 65613658e0f..8e57adbfb1a 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { inputstreamhelper ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.youtube"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 86164682138..7377e638676 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,8 +1,19 @@ -{ lib, makeWrapper, buildEnv, kodi, addons }: +{ lib, makeWrapper, buildEnv, kodi, addons, callPackage }: let + kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; }; + # linux distros are supposed to provide pillow and pycryptodome - requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons; + requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodome ]); + + # each kodi addon can potentially export a python module which should be included in PYTHONPATH + # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml` + # eg. `<extension point="xbmc.python.module" library="lib" />` -> pythonPath = "lib"; + additionalPythonPath = + let + addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons; + in + lib.concatMapStringsSep ":" (addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}") addonsWithPythonPath; in buildEnv { @@ -18,7 +29,7 @@ buildEnv { for exe in kodi{,-standalone} do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \ + --prefix PYTHONPATH : ${requiredPythonPath}:${additionalPythonPath} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath (lib.concatMap diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3a9c4809c62..6ea41b4d925 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -34,7 +34,6 @@ mkDerivation rec { sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; }; - enableParallelBuilding = true; nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index d7ade6899dc..fde2833c98c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "streamlink"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm"; + sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v"; }; checkInputs = with python3.pkgs; [ @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/streamlink/streamlink"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' - Streamlink is a CLI utility that pipes flash videos from online + Streamlink is a CLI utility that pipes videos from online streaming services to a variety of video players such as VLC, or alternatively, a browser. @@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ dezgeg zraexy ]; + maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index ca9ae20f346..0c44805bedd 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.2"; + version = "1.5.4"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als="; + sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 42095da8f52..26e56ccc609 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-WoQeZkHuCQGv//UKTpvucJXq7xI9Fkil8V1B1qTM75k="; + sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 84019395853..020e22db601 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk"; + sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a8fbb1d09c1..1d049621aa5 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = '' mv firecracker-* firecracker diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix deleted file mode 100644 index 37f03d8772f..00000000000 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }: - -with lib; - -let version = "0.600.4"; in - -stdenv.mkDerivation rec { - pname = "virtinst"; - inherit version; - - src = fetchurl { - url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; - sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; - }; - - pythonPath = with python2Packages; - [ setuptools eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted - distutils_extra simplejson cheetah lockfile httplib2 - # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python urlgrabber - ]; - - buildInputs = - [ python2Packages.python - python2Packages.wrapPython - python2Packages.mox - intltool - ] ++ pythonPath; - - buildPhase = "python setup.py build"; - - installPhase = - '' - python setup.py install --prefix="$out"; - wrapPythonPrograms - ''; - - meta = { - homepage = "http://virt-manager.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [qknight]; - description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix new file mode 100644 index 00000000000..a536a44d452 --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -0,0 +1,21 @@ +{ i3lock-color, lib, fetchFromGitHub }: + +i3lock-color.overrideAttrs (oldAttrs : rec { + pname = "i3lock-blur"; + version = "2.10"; + + src = fetchFromGitHub { + owner = "karulont"; + repo = "i3lock-blur"; + rev = version; + sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0="; + }; + + meta = with lib; { + description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; + homepage = "https://github.com/karulont/i3lock-blur/"; + license = licenses.bsd3; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6ba5890885d..a759726eb10 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -45,7 +45,7 @@ rec { targetPkgs = pkgs: [ appimage-exec ] ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; - runScript = "appimage-exec.sh -w ${src}"; + runScript = "appimage-exec.sh -w ${src} --"; } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 868686bd5c0..23718bf636c 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -62,6 +62,7 @@ let # Fonts "fonts" # ALSA + "alsa" "asound.conf" # SSL "ssl/certs" diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 965b8d8189a..08257ff2542 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -28,7 +28,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ emacs --batch -Q -l ${./elpa2nix.el} \ -f elpa2nix-install-package \ - "${src}" "$out/share/emacs/site-lisp/elpa" + "$src" "$out/share/emacs/site-lisp/elpa" runHook postInstall ''; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 292baed20df..e5095478002 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -19,9 +19,9 @@ sourceforge = [ "https://downloads.sourceforge.net/" "https://prdownloads.sourceforge.net/" - "https://heanet.dl.sourceforge.net/sourceforge/" - "https://surfnet.dl.sourceforge.net/sourceforge/" - "https://dfn.dl.sourceforge.net/sourceforge/" + "https://netcologne.dl.sourceforge.net/sourceforge/" + "https://versaweb.dl.sourceforge.net/sourceforge/" + "https://freefr.dl.sourceforge.net/sourceforge/" "https://osdn.dl.sourceforge.net/sourceforge/" "https://kent.dl.sourceforge.net/sourceforge/" ]; diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index 5d7b945bf1b..497dcb0660b 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -41,6 +41,9 @@ in rec { let split = match "^(!?)(.*)" l; in [(elemAt split 1) (head split == "!")]; + # regex -> regex + handleHashesBangs = replaceStrings ["\\#" "\\!"] ["#" "!"]; + # ignore -> regex substWildcards = let @@ -86,7 +89,7 @@ in rec { mapPat = f: l: [(f (head l)) (last l)]; in map (l: # `l' for "line" - mapPat (l: handleSlashSuffix (handleSlashPrefix (mapAroundCharclass substWildcards l))) + mapPat (l: handleSlashSuffix (handleSlashPrefix (handleHashesBangs (mapAroundCharclass substWildcards l)))) (computeNegation l)) (filter (l: !isList l && !isComment l) (split "\n" gitignore)); diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix index d0cda3da544..b9cedffa194 100644 --- a/pkgs/data/documentation/anarchism/default.nix +++ b/pkgs/data/documentation/anarchism/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; }; - phases = [ "unpackPhase" "postPatch" "installPhase" ]; - postPatch = '' substituteInPlace debian/anarchism.desktop \ --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index d31272c2a5f..79a48acd9f2 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.11"; + version = "5.12"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo="; + sha256 = "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs"; }; - makeFlags = [ "MANDIR=$(out)/share/man" ]; + makeFlags = [ "prefix=$(out)" ]; postInstall = '' # conflict with shadow-utils rm $out/share/man/man5/passwd.5 \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; - repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages"; + repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages"; license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 4799804b9ec..aaa380098a2 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.000"; + version = "6.001"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-5ymTBFssoEhmc2Z+JyEcMqw2p91i9/R44GRzEzUzK9Q="; + sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc="; meta = with lib; { homepage = "https://software.sil.org/andika"; diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index a78bf6b4a78..c223f9366af 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2105.24"; + version = "2106.17"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "sha256-j3IPzrch8oueOmCDa2gpD8uYFs8cKWjkxcmicZcfqQ8="; + sha256 = "sha256-EsXD6gY3q3KIk37vYPz731lLz5989cd+s5fz5rKIn2k="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index df618aea811..7485d435cb2 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { stripRoot = false; # because it comes with a __MACOSX directory }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index b399741f933..27577047eca 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" ]; + dontInstall = true; unpackPhase = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 146b832af9c..59381727566 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -58,15 +58,15 @@ in stdenv.mkDerivation rec { pname = "joypixels"; - version = "6.5.0"; + version = "6.6.0"; src = assert !acceptLicense -> throwLicense; with systemSpecific; fetchurl { name = fontFile; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { - darwin = "034bwxy6ljvhx9zlm6jkb8vw222sg79sjwlcjfql51rk6zkmv4wx"; - }.${kernel.name} or "1v6hz0qhbnzayxhs5j9qfa2ggn7nak53ij7kr06m93wcmlnnln86"; + darwin = "0qcmb2vn2nykyikzgnlma627zhks7ksy1vkgvpcmqwyxq4bd38d7"; + }.${kernel.name} or "17gjaz7353zyprmds64p01qivy2r8pwf88nvvhi57idas2qd604n"; }; dontUnpack = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' - Updated for 2021! JoyPixels 6.5 includes 3,559 originally crafted icon + Updated for 2021! JoyPixels 6.6 includes 3,559 originally crafted icon designs and is 100% Unicode 13.1 compatible. We offer the largest selection of files ranging from png, svg, iconjar, sprites, and fonts. ''; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix deleted file mode 100644 index fb1595fe2fc..00000000000 --- a/pkgs/data/fonts/lobster-two/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{lib, stdenv, fetchurl}: - -let - - # HG revision in which this version of the font can be fount. - rev = "8e98053718f9a15184c93d6530885791be71b756"; - - urlBase = "https://googlefontdirectory.googlecode.com/hg-history/${rev}/ofl/lobstertwo"; - - # Just a small convenience function. - fetch = {name, path ? "/src", sha256}: - { - inherit name; - file = fetchurl { - url = "${urlBase}${path}/${name}"; - inherit sha256; - }; - }; - - fontlog = - fetch { - name = "FONTLOG.txt"; - path = ""; - sha256 = "0n405i8m70q95y8w43gzr5yvkj7gx7rd3xa4rx6y8qcqv5g7v9if"; - }; - - bold = - fetch { - name = "LobsterTwo-Bold.otf"; - sha256 = "0gkayn96vvgngs9xnmcyyf16q4payk79ghvl354rl93ayb3gf7x0"; - }; - - boldItalic = - fetch { - name = "LobsterTwo-BoldItalic.otf"; - sha256 = "0wznqkvwjqi9s4bg10fpp2345by3nxa0m0w6b3al3zaqyx2p1dxp"; - }; - - italic = - fetch { - name = "LobsterTwo-Italic.otf"; - sha256 = "0lpnzwgwl5fm6gqy8bylbryz0hy94mf1mp615y5sh0wikdvk570z"; - }; - - regular = - fetch { - name = "LobsterTwo-Regular.otf"; - sha256 = "147m3sa3sqqbkbw1hgjdwnw8w0y37x58g5p09s7q2vm74flcpbq1"; - }; -in - - stdenv.mkDerivation rec { - pname = "lobstertwo"; - version = "1.006"; - - phases = ["installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${pname}-${version} - cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name} - cp -v ${bold.file} $out/share/fonts/opentype/${bold.name} - cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name} - cp -v ${italic.file} $out/share/fonts/opentype/${italic.name} - cp -v ${regular.file} $out/share/fonts/opentype/${regular.name} - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; - - meta = with lib; { - homepage = "https://github.com/librefonts/lobstertwo"; - description = "Script font with many ligatures"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [maintainers.rycee]; - broken = true; # googlecode.com RIP; can be built from sources - }; - } diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 7083b9e0031..a55fb65c56c 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = '' unzip -j ${meslo-lg} unzip -j ${meslo-lg-dz} diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 507faae53e3..7fb7387179a 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ec0fa407d73..17a63debdc6 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; - phases = [ "installPhase" ]; - installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index cff5f911584..f9eed54534c 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20210623"; + version = "20210715"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-FKsbAvjhXb2ipe3XqACM6OwGYwbBbzvDjsUQYCIQ8NM="; + hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA="; }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix index 56bd074c2cb..1a7887fc35d 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.1"; + version = "40.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; + sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index c1bd10ce2ea..aa7efdf51c8 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.2"; + version = "40.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Tp2CmwOfoK3TO7ZYP8e04Cjtjc/3r4pXfgnMZpiMKBw="; + sha256 = "sha256-erEMbulpmCjdch6/jOHeRk3KqpHUlYI79LhMiTmejCs="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix deleted file mode 100755 index 552e0a2dcaf..00000000000 --- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, gnome, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-fuzzy-app-search"; - version = "4.0.1"; - - src = fetchFromGitLab { - owner = "Czarlie"; - repo = "gnome-fuzzy-app-search"; - rev = "v${version}"; - sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a"; - }; - - passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; - - nativeBuildInputs = [ glib ]; - - makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; - - meta = with lib; { - description = "Fuzzy application search results for Gnome Search"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; - broken = versionOlder gnome.gnome-shell.version "3.18"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 53395c5c861..3e99f3143d2 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -9,7 +9,6 @@ "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; - "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index 125e39d1f46..dd9ab9be1d3 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; version = caja.version; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 791c2508e12..8b02af57d42 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.6.1"; + version = "1.6.2"; repoName = "calculator"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-LGY111wPldxuSfqhZ2E2TeJjexcGbfS25RjLw+Wi99c="; + sha256 = "sha256-kOQr94PAfLPv4LjY2WDdTtlbf3/tYf+NUESZ94+L41M="; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index a89ea19079e..d273f03f4bd 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "elementary-sound-theme"; - version = "1.0"; + version = "1.1.0"; repoName = "sound-theme"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-v8ludbPCJaMHCxuzjZchTJwpGiF6UJlVMIMFg+lAhbU="; + sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix new file mode 100644 index 00000000000..7a0b6162257 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -0,0 +1,40 @@ +{ lib, stdenv +, cmake, fetchFromGitHub, extra-cmake-modules +, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner +}: + +stdenv.mkDerivation rec { + pname = "krunner-symbols"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "domschrei"; + repo = "krunner-symbols"; + rev = version; + sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo="; + }; + + buildInputs = [ qtbase ki18n kdelibs4support krunner ]; + nativeBuildInputs = [ cmake wrapQtAppsHook extra-cmake-modules ]; + + postPatch = '' + # symbols.cpp hardcodes the location of configuration files + substituteInPlace symbols.cpp \ + --replace "/usr/share/config/krunner-symbol" "$out/share/config/krunner-symbol" + + # change cmake flag names to output using the correct qt-plugin prefix and kservice location + substituteInPlace CMakeLists.txt \ + --replace "LOCATION_PLUGIN" "KDE_INSTALL_PLUGINDIR" \ + --replace "LOCATION_DESKTOP" "KDE_INSTALL_KSERVICES5DIR" + ''; + + cmakeFlags = [ "-DLOCATION_CONFIG=share/config" ]; + + meta = with lib; { + description = "A little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword"; + homepage = "https://github.com/domschrei/krunner-symbols"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 4b41e5ad9d5..9252aa7b39b 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -158,6 +158,7 @@ let kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; }; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d2d866a2804..ee47ebd9888 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }: +{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten }: stdenv.mkDerivation rec { pname = "binaryen"; - version = "96"; + version = "99"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag"; + sha256 = "1a6ixxm1f8mrr9mn6a0pimajdzsdr4w1qhr92skxq67168vvc1ic"; }; - patches = [ - # Adds --minimize-wasm-changes option required by emscripten 2.0.1 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch"; - sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s"; - }) - ]; - nativeBuildInputs = [ cmake python3 ]; meta = with lib; { diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 648ec156abe..a142008e2e3 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.1"; + version = "2.0.10"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk"; + sha256 = "0jy4n1pykk9vkm5da9v3qsfrl6j7yhngcazh2792xxs6wzfcs9gk"; rev = version; }; @@ -43,10 +43,14 @@ stdenv.mkDerivation rec { sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py sed -i "/^def check_sanity/a\\ return" tools/shared.py + # super ugly: monkeypatch to add sysroot/include to the include + # path because they are otherwise not part of Nix's clang. + sed -i "490a\\ '/include'," tools/shared.py + # required for wasm2c ln -s ${nodeModules}/node_modules . - echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten + echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten echo "JS_ENGINES = [NODE_JS]" >> .emscripten @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { chmod -R +w $appdir mkdir -p $out/bin - for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules}/node_modules \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 039d215efcd..36cd2efe27a 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,15 +1,15 @@ { "name": "emscripten", - "version": "2.0.1", - "private": true, + "version": "2.0.10", "devDependencies": { + "es-check": "^5.1.0", "ws": "~0.4.28" }, "dependencies": { - "google-closure-compiler": "20200224.0.0", + "acorn": "7.3.1", + "google-closure-compiler": "20200920.0.0", "html-minifier-terser": "5.0.2", "source-map": "0.5.6", - "wasm2c": "1.0.0", - "acorn": "7.3.1" + "wasm2c": "1.0.0" } } diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock index 079b254a472..948fcd4ed7f 100644 --- a/pkgs/development/compilers/emscripten/yarn.lock +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -7,6 +7,31 @@ acorn@7.3.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== +acorn@^6.4.1: + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + +ansi-escapes@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" + integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -14,6 +39,42 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi@^0.3.0, ansi@~0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +async@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" + integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k= + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +bluebird@^3.4.7: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -27,6 +88,21 @@ camel-case@^3.0.0: no-case "^2.2.0" upper-case "^1.1.1" +caporal@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/caporal/-/caporal-1.4.0.tgz#d6087b815e3df97c3a0f55dbb82850fae29ed585" + integrity sha512-3pWfIwKVdIbB/gWmpLloO6iGAXTRi9mcTinPOwvHfzH3BYjOhLgq2XRG3hKtp+F6vBcBXxMgCobUzBAx1d8T4A== + dependencies: + bluebird "^3.4.7" + cli-table3 "^0.5.0" + colorette "^1.0.1" + fast-levenshtein "^2.0.6" + lodash "^4.17.14" + micromist "1.1.0" + prettyjson "^1.2.1" + tabtab "^2.2.2" + winston "^2.3.1" + chalk@2.x: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -36,6 +112,17 @@ chalk@2.x: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + clean-css@^4.2.1: version "4.2.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" @@ -43,6 +130,28 @@ clean-css@^4.2.1: dependencies: source-map "~0.6.0" +cli-cursor@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" + integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= + dependencies: + restore-cursor "^1.0.1" + +cli-table3@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202" + integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw== + dependencies: + object-assign "^4.1.0" + string-width "^2.1.1" + optionalDependencies: + colors "^1.1.2" + +cli-width@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== + clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" @@ -67,6 +176,11 @@ cloneable-readable@^1.0.0: process-nextick-args "^2.0.0" readable-stream "^2.3.5" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -79,6 +193,21 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +colorette@^1.0.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +colors@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + +colors@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -94,62 +223,174 @@ commander@~2.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.4.7: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -escape-string-regexp@^1.0.5: +cycle@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" + integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI= + +debug@^2.2.0: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +es-check@^5.1.0: + version "5.2.4" + resolved "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz#76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7" + integrity sha512-FZ3qAJ9hwguqPvGGagaKAVDnusSkezeHbiKNM5rOepOjloeVuX2e6meMxQ+mKcnWbAFucCG7fszNrzUT8bvHcQ== + dependencies: + acorn "^6.4.1" + caporal "1.4.0" + glob "^7.1.2" + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -google-closure-compiler-java@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc" - integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ== - -google-closure-compiler-js@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500" - integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g== +exit-hook@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" + integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g= -google-closure-compiler-linux@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902" - integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ== +extend@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -google-closure-compiler-osx@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed" - integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ== +external-editor@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b" + integrity sha1-Etew24UPf/fnCBuvQAVwAGDEYAs= + dependencies: + extend "^3.0.0" + spawn-sync "^1.0.15" + tmp "^0.0.29" + +eyes@0.1.x: + version "0.1.8" + resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" + integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= + +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +figures@^1.3.5: + version "1.7.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + dependencies: + escape-string-regexp "^1.0.5" + object-assign "^4.1.0" -google-closure-compiler-windows@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58" - integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg== +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -google-closure-compiler@20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283" - integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog== +gauge@~1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" + integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= + dependencies: + ansi "^0.3.0" + has-unicode "^2.0.0" + lodash.pad "^4.1.0" + lodash.padend "^4.1.0" + lodash.padstart "^4.1.0" + +glob@^7.1.2: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +google-closure-compiler-java@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz#23519b14e004f2a9eda4f5b887842ae46ad7022e" + integrity sha512-q8m/+QLBWrzjg5VZ2b4B628zDvbi0Gyenj9bvZQlPY7mqj68HXhe5aOfKzZO7vXgHDXMvsvI3v/1g5mPAku/5w== + +google-closure-compiler-linux@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz#622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b" + integrity sha512-F5HcTbeklcaxdWzlZu5b1ZKzCt1kSBUWsBfvlrDCFkA2pdBxIIC2VPokGAUZCqlfno2J2gYARz8FNCrx0tCx5g== + +google-closure-compiler-osx@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz#6157a06e7d851d25d60de95c4bcd464d768278b1" + integrity sha512-2WY+HaUWVQNg9WZs9d4Op3zvS6yIVN2AIouU4grwYWXfFk+CMXZou0ASlsOURaYc2WZ22LW/G1w3vINDoCkSww== + +google-closure-compiler-windows@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz#755ddeb8032530c6ed13962e328d9af3269d0748" + integrity sha512-0c4Dem3em3ASNpcR/2USx1Kvb+I7L2MvsV1IZ5Pu98jTuhnkmlccQqPzk2rZR6lllVbVFXTb6tju0JxZ7Zoxjg== + +google-closure-compiler@20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz#e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3" + integrity sha512-IOC77xL3+pYcAM+OVfcILKdrZNEy767JmpdVs2sq3I9+4JoHeKaJrmQXgbcXN2reUmzBw5b5m9Kd036Cr8ouBA== dependencies: chalk "2.x" - google-closure-compiler-java "^20200224.0.0" - google-closure-compiler-js "^20200224.0.0" + google-closure-compiler-java "^20200920.0.0" minimist "1.x" vinyl "2.x" vinyl-sourcemaps-apply "^0.2.0" optionalDependencies: - google-closure-compiler-linux "^20200224.0.0" - google-closure-compiler-osx "^20200224.0.0" - google-closure-compiler-windows "^20200224.0.0" + google-closure-compiler-linux "^20200920.0.0" + google-closure-compiler-osx "^20200920.0.0" + google-closure-compiler-windows "^20200920.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -168,26 +409,137 @@ html-minifier-terser@5.0.2: relateurl "^0.2.7" terser "^4.3.9" -inherits@^2.0.1, inherits@~2.0.3: +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +inquirer@^1.0.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" + integrity sha1-TexvMvN+97sLLtPx0aXD9UUHSRg= + dependencies: + ansi-escapes "^1.1.0" + chalk "^1.0.0" + cli-cursor "^1.0.1" + cli-width "^2.0.0" + external-editor "^1.1.0" + figures "^1.3.5" + lodash "^4.3.0" + mute-stream "0.0.6" + pinkie-promise "^2.0.0" + run-async "^2.2.0" + rx "^4.1.0" + string-width "^1.0.1" + strip-ansi "^3.0.0" + through "^2.3.6" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isstream@0.1.x: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash.difference@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" + integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= + +lodash.pad@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" + integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= + +lodash.padend@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" + integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= + +lodash.padstart@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" + integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4.17.14, lodash@^4.3.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -minimist@1.x: +micromist@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromist/-/micromist-1.1.0.tgz#a490bcf9a4b918ad9eed8e52d0ec98b9c3b2d3c8" + integrity sha512-+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg== + dependencies: + lodash.camelcase "^4.3.0" + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@1.x, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +mute-stream@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" + integrity sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s= + nan@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38" @@ -200,11 +552,52 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" +npmlog@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" + integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= + dependencies: + ansi "~0.3.1" + are-we-there-yet "~1.1.2" + gauge "~1.2.5" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" + integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= + options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= +os-shim@^0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" + integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= + +os-tmpdir@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + param-case@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" @@ -212,12 +605,37 @@ param-case@^2.1.1: dependencies: no-case "^2.2.0" +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +prettyjson@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289" + integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok= + dependencies: + colors "^1.1.2" + minimist "^1.2.0" + process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -readable-stream@^2.3.5: +readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -245,6 +663,24 @@ replace-ext@^1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== +restore-cursor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" + integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE= + dependencies: + exit-hook "^1.0.0" + onetime "^1.0.0" + +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +rx@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= + safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -273,6 +709,36 @@ source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spawn-sync@^1.0.15: + version "1.0.15" + resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" + integrity sha1-sAeZVX63+wyDdsKdROih6mfldHY= + dependencies: + concat-stream "^1.4.7" + os-shim "^0.1.2" + +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -280,6 +746,25 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -287,6 +772,20 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +tabtab@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz#7a047f143b010b4cbd31f857e82961512cbf4e14" + integrity sha1-egR/FDsBC0y9MfhX6ClhUSy/ThQ= + dependencies: + debug "^2.2.0" + inquirer "^1.0.2" + lodash.difference "^4.5.0" + lodash.uniq "^4.5.0" + minimist "^1.2.0" + mkdirp "^0.5.1" + npmlog "^2.0.3" + object-assign "^4.1.0" + terser@^4.3.9: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" @@ -296,11 +795,28 @@ terser@^4.3.9: source-map "~0.6.1" source-map-support "~0.5.12" +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + tinycolor@0.x: version "0.0.1" resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164" integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ= +tmp@^0.0.29: + version "0.0.29" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0" + integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= + dependencies: + os-tmpdir "~1.0.1" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" @@ -335,6 +851,23 @@ wasm2c@1.0.0: resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== +winston@^2.3.1: + version "2.4.5" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a" + integrity sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A== + dependencies: + async "~1.0.0" + colors "1.0.x" + cycle "1.0.x" + eyes "0.1.x" + isstream "0.1.x" + stack-trace "0.0.x" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + ws@~0.4.28: version "0.4.32" resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32" diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix index af01d9c6869..d0c3395f28a 100644 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -10,6 +10,46 @@ }; } { + name = "acorn___acorn_6.4.2.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; + }; + } + { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { name = "ansi_styles___ansi_styles_3.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; @@ -18,6 +58,54 @@ }; } { + name = "ansi___ansi_0.3.1.tgz"; + path = fetchurl { + name = "ansi___ansi_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "async___async_1.0.0.tgz"; + path = fetchurl { + name = "async___async_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { name = "buffer_from___buffer_from_1.1.1.tgz"; path = fetchurl { name = "buffer_from___buffer_from_1.1.1.tgz"; @@ -34,6 +122,14 @@ }; } { + name = "caporal___caporal_1.4.0.tgz"; + path = fetchurl { + name = "caporal___caporal_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/caporal/-/caporal-1.4.0.tgz"; + sha1 = "d6087b815e3df97c3a0f55dbb82850fae29ed585"; + }; + } + { name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; @@ -42,6 +138,14 @@ }; } { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { name = "clean_css___clean_css_4.2.3.tgz"; @@ -50,6 +154,30 @@ }; } { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + } + { + name = "cli_table3___cli_table3_0.5.1.tgz"; + path = fetchurl { + name = "cli_table3___cli_table3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz"; + sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + }; + } + { name = "clone_buffer___clone_buffer_1.0.0.tgz"; path = fetchurl { name = "clone_buffer___clone_buffer_1.0.0.tgz"; @@ -82,6 +210,14 @@ }; } { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { name = "color_convert___color_convert_1.9.3.tgz"; path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; @@ -98,6 +234,30 @@ }; } { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } + { + name = "colors___colors_1.0.3.tgz"; + path = fetchurl { + name = "colors___colors_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } + { name = "commander___commander_2.20.3.tgz"; path = fetchurl { name = "commander___commander_2.20.3.tgz"; @@ -122,6 +282,22 @@ }; } { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -130,6 +306,38 @@ }; } { + name = "cycle___cycle_1.0.3.tgz"; + path = fetchurl { + name = "cycle___cycle_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "es_check___es_check_5.2.4.tgz"; + path = fetchurl { + name = "es_check___es_check_5.2.4.tgz"; + url = "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz"; + sha1 = "76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7"; + }; + } + { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; @@ -138,51 +346,123 @@ }; } { - name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; + name = "exit_hook___exit_hook_1.1.1.tgz"; + path = fetchurl { + name = "exit_hook___exit_hook_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "external_editor___external_editor_1.1.1.tgz"; + path = fetchurl { + name = "external_editor___external_editor_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz"; + sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; + }; + } + { + name = "eyes___eyes_0.1.8.tgz"; + path = fetchurl { + name = "eyes___eyes_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz"; - sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc"; + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } { - name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; + name = "figures___figures_1.7.0.tgz"; path = fetchurl { - name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz"; - sha1 = "cf4b598abf7be686c683e530529756805b8af500"; + name = "figures___figures_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; }; } { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; + name = "fs.realpath___fs.realpath_1.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz"; - sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902"; + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; + name = "gauge___gauge_1.2.7.tgz"; path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz"; - sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed"; + name = "gauge___gauge_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz"; + sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; }; } { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; + name = "glob___glob_7.1.7.tgz"; path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz"; - sha1 = "cae323b898625ca57b0e87aaddde021a414dda58"; + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; }; } { - name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; + name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz"; - sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283"; + name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz"; + sha1 = "23519b14e004f2a9eda4f5b887842ae46ad7022e"; + }; + } + { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz"; + sha1 = "622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b"; + }; + } + { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz"; + sha1 = "6157a06e7d851d25d60de95c4bcd464d768278b1"; + }; + } + { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz"; + sha1 = "755ddeb8032530c6ed13962e328d9af3269d0748"; + }; + } + { + name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz"; + sha1 = "e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; } { @@ -194,6 +474,14 @@ }; } { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { name = "he___he_1.2.0.tgz"; path = fetchurl { name = "he___he_1.2.0.tgz"; @@ -210,6 +498,14 @@ }; } { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { name = "inherits___inherits_2.0.4.tgz"; path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; @@ -218,6 +514,30 @@ }; } { + name = "inquirer___inquirer_1.2.3.tgz"; + path = fetchurl { + name = "inquirer___inquirer_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; @@ -226,6 +546,70 @@ }; } { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + path = fetchurl { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + } + { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { + name = "lodash.pad___lodash.pad_4.5.1.tgz"; + path = fetchurl { + name = "lodash.pad___lodash.pad_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; + }; + } + { + name = "lodash.padend___lodash.padend_4.6.1.tgz"; + path = fetchurl { + name = "lodash.padend___lodash.padend_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + }; + } + { + name = "lodash.padstart___lodash.padstart_4.6.1.tgz"; + path = fetchurl { + name = "lodash.padstart___lodash.padstart_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { name = "lower_case___lower_case_1.1.4.tgz"; path = fetchurl { name = "lower_case___lower_case_1.1.4.tgz"; @@ -234,6 +618,22 @@ }; } { + name = "micromist___micromist_1.1.0.tgz"; + path = fetchurl { + name = "micromist___micromist_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromist/-/micromist-1.1.0.tgz"; + sha1 = "a490bcf9a4b918ad9eed8e52d0ec98b9c3b2d3c8"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; @@ -242,6 +642,30 @@ }; } { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "mute_stream___mute_stream_0.0.6.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + } + { name = "nan___nan_1.0.0.tgz"; path = fetchurl { name = "nan___nan_1.0.0.tgz"; @@ -258,6 +682,46 @@ }; } { + name = "npmlog___npmlog_2.0.4.tgz"; + path = fetchurl { + name = "npmlog___npmlog_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz"; + sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_1.1.0.tgz"; + path = fetchurl { + name = "onetime___onetime_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + } + { name = "options___options_0.0.6.tgz"; path = fetchurl { name = "options___options_0.0.6.tgz"; @@ -266,6 +730,22 @@ }; } { + name = "os_shim___os_shim_0.1.3.tgz"; + path = fetchurl { + name = "os_shim___os_shim_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz"; + sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { name = "param_case___param_case_2.1.1.tgz"; path = fetchurl { name = "param_case___param_case_2.1.1.tgz"; @@ -274,6 +754,38 @@ }; } { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "prettyjson___prettyjson_1.2.1.tgz"; + path = fetchurl { + name = "prettyjson___prettyjson_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz"; + sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; + }; + } + { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; @@ -314,6 +826,30 @@ }; } { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + } + { + name = "run_async___run_async_2.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; + }; + } + { + name = "rx___rx_4.1.0.tgz"; + path = fetchurl { + name = "rx___rx_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + } + { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; @@ -354,6 +890,38 @@ }; } { + name = "spawn_sync___spawn_sync_1.0.15.tgz"; + path = fetchurl { + name = "spawn_sync___spawn_sync_1.0.15.tgz"; + url = "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz"; + sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; + }; + } + { + name = "stack_trace___stack_trace_0.0.10.tgz"; + path = fetchurl { + name = "stack_trace___stack_trace_0.0.10.tgz"; + url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; @@ -362,6 +930,30 @@ }; } { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { name = "supports_color___supports_color_5.5.0.tgz"; path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; @@ -370,6 +962,14 @@ }; } { + name = "tabtab___tabtab_2.2.2.tgz"; + path = fetchurl { + name = "tabtab___tabtab_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz"; + sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14"; + }; + } + { name = "terser___terser_4.8.0.tgz"; path = fetchurl { name = "terser___terser_4.8.0.tgz"; @@ -378,6 +978,14 @@ }; } { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { name = "tinycolor___tinycolor_0.0.1.tgz"; path = fetchurl { name = "tinycolor___tinycolor_0.0.1.tgz"; @@ -386,6 +994,22 @@ }; } { + name = "tmp___tmp_0.0.29.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { name = "upper_case___upper_case_1.1.3.tgz"; path = fetchurl { name = "upper_case___upper_case_1.1.3.tgz"; @@ -426,6 +1050,22 @@ }; } { + name = "winston___winston_2.4.5.tgz"; + path = fetchurl { + name = "winston___winston_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz"; + sha1 = "f2e431d56154c4ea765545fc1003bd340c95b59a"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { name = "ws___ws_0.4.32.tgz"; path = fetchurl { name = "ws___ws_0.4.32.tgz"; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index e8a90ac0b8d..21080fd96cb 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -41,6 +41,7 @@ let "armv6l" = "arm"; "armv7l" = "arm"; "powerpc64le" = "ppc64le"; + "mips" = "mips"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); # We need a target compiler which is still runnable at build time, diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 8dee4cae896..74ab1342dab 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -41,6 +41,7 @@ let "armv6l" = "arm"; "armv7l" = "arm"; "powerpc64le" = "ppc64le"; + "mips" = "mips"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); # We need a target compiler which is still runnable at build time, diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index f85d2bba907..49a2f9656f3 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -41,6 +41,7 @@ let "armv6l" = "arm"; "armv7l" = "arm"; "powerpc64le" = "ppc64le"; + "mips" = "mips"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); # We need a target compiler which is still runnable at build time, diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 07d90f9e013..7e46e4bf2ea 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.20"; + version = "1.5.21"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "12wa7blf7l4360rfm8fk5x36ij0x1m61wrjrxkvligdavmil5wzd"; + sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 1024ddb6a8a..adb7490785e 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchFromGitHub, crystal_0_36, openssl }: +{ lib, fetchFromGitHub, crystal_1_0, openssl }: let - crystal = crystal_0_36; + crystal = crystal_1_0; in crystal.buildCrystalPackage rec { - version = "0.11.0"; + version = "0.14.0"; pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "sha256-QqO4Kc8hf6WNCENPvLwYIF9gtXG/VRR7DhyZvxB4VsA="; + sha256 = "1mf9d0jpdb21hkzaqvwyx2171dv3hr50zhl07p85wpf0d3n5wml8"; }; postPatch = '' @@ -34,6 +34,6 @@ crystal.buildCrystalPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - broken = lib.versionOlder crystal.version "0.33"; + broken = lib.versionOlder crystal.version "1.0"; }; } diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index 595f9c5ebee..49ba1ad7432 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,79 +2,55 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.11.2"; - sha256 = "0rxsy41d0qpw9h1d3jvhmbmzqba9yhgyzc0jrdbg28f59fl7zp7q"; + rev = "v1.11.4"; + sha256 = "1rpybhhzz892s2dp2kzbkkn1c8c7574275ql6amhbvc6ds5j3i46"; }; ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.13.3"; - sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + rev = "v0.14.2"; + sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2"; }; baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "7183bfde8d86a976a6912f582b51cbd1783456af"; - sha256 = "0s1bsrimz30wfkkfmb4bm49mx44nhqj0hky8jkn0kz0mpc28mkkl"; - }; - diff = { - owner = "MakeNowJust"; - repo = "crystal-diff"; - rev = "v1.1.0"; - sha256 = "1q5q2d5mp1r8c6k5v4755sb3b6awiz85d1j280djzhbd0pggk3z7"; + rev = "v0.10.0"; + sha256 = "10f25sby8ipps5c2jj4j2q30kscgv4g1s5nhdddmldhg9isj0jli"; }; dotenv = { owner = "gdotdesign"; repo = "cr-dotenv"; - rev = "v0.3.1"; - sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz"; + rev = "v1.0.0"; + sha256 = "00pdawysns1w1iqwh6j3shilpwh41ljz1chsqkacn6dj2yn21n0r"; }; exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.4"; - sha256 = "0bsp2m89sl0bg9d5szbs1nxyk7yk58rkk24aibr39hhb5zi70pqi"; + rev = "v0.1.5"; + sha256 = "0nlph4rmavwsndf94hisdikh3qhhkyyh97cc39mvbqzrqrc6lbx3"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.27.0"; - sha256 = "01p5fkm6q9k6390dhhw3dwwzlxhxafykknkkcayv1k4ynn126hi7"; + rev = "v1.0.0"; + sha256 = "0yy6mkqyxlgdi6svj206iprw3njrxw61y2s2wwz78yz7j6sly1wf"; }; kilt = { owner = "jeromegn"; repo = "kilt"; - rev = "v0.4.0"; - sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k"; + rev = "v0.4.1"; + sha256 = "1bhmmk4djnysf2fr0020dakn1730a33xzi10c8lg1a343x77rm64"; }; markd = { owner = "icyleaf"; repo = "markd"; - rev = "620845abb6776d1765d20d86cc0220aa40f89a91"; - sha256 = "1nq1ddmd2kgnl8vrk0y65lqhy145740a3s68kn0advm2xx8rbhmy"; + rev = "v0.4.0"; + sha256 = "0zi39ik7zqnidysafwn6icpr0gdb6z40v63bx5hablarpf2r9637"; }; radix = { owner = "luislavena"; repo = "radix"; - rev = "v0.3.9"; - sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix"; - }; - string_inflection = { - owner = "mosop"; - repo = "string_inflection"; - rev = "v0.2.1"; - sha256 = "10vkr28h7n53ijjv57ldxhh473086qg313lzs55a7wsh0zgc104m"; - }; - time_format = { - owner = "vladfaust"; - repo = "time_format.cr"; - rev = "v0.1.1"; - sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v"; - }; - tree_template = { - owner = "gdotdesign"; - repo = "tree_template"; - rev = "7e24c92208cc99938f3fbd8f5fecda22bcbe3cc3"; - sha256 = "0ixscq7nqlp83x976d41kq83a5gw9kkk7lnxhlsc91000hm5h3wq"; + rev = "v0.4.1"; + sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg"; }; } diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix index dc805f7e61c..008d2cd6d07 100644 --- a/pkgs/development/compilers/ocaml/4.13.nix +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0-alpha1"; + patch_version = "0-alpha2"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha1.tar.xz"; - sha256 = "071k12q8m2w9bcwvfclyc46pwd9r49v6av36fhjdlqq29niyq915"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz"; + sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif"; }; } diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index bf85fd35335..0f19b19b604 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "11"; - build = "9"; + update = "12"; + build = "7"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx"; + sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli"; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index 0feaabc92e6..0f617d0f661 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.117"; src = fetchurl { - url = "www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; + url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z"; }; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index ac1851a683b..3174744fdde 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; doCheck = true; - enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; outputs = [ "bin" "dev" "out" "static" ]; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index d0bfa5b0b96..74c2503523e 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytestrunner }: +, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx +, sphinx_rtd_theme, pytest-runner }: let sample-contract = writeText "example.vy" '' @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 254afae0cc4..0b3dfefcbe8 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ="; + sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; postConfigure = '' diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index c0a11cf9f02..0d2984904d8 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, libck, darwin }: let - version = "0.21"; + version = "0.30.0"; bootstrap = stdenv.mkDerivation { pname = "cyclone-bootstrap"; inherit version; @@ -10,7 +10,7 @@ let owner = "justinethier"; repo = "cyclone-bootstrap"; rev = "v${version}"; - sha256 = "0bb3a7x7vzmdyhm4nilm8bcn4q50pwqryggnxz21n16v6xakwjmr"; + sha256 = "sha256-/zAcCBdJ7YQXsspdjrMca1Oj9SUUFXQKLwZPoZLhHYg="; }; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation { owner = "justinethier"; repo = "cyclone"; rev = "v${version}"; - sha256 = "1vb4yaprs2bwbxmxx2zkqvysxx8r9qww2q1nqkz8yps3ji715jw7"; + sha256 = "sha256-a3wiqKlIbnvIhyrI0lyVGciQiM7KSuYH5iUfGFrgOuM="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 2ef3f3d3920..3978f380a3b 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.5"; + version = "2021.Q3.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8="; + sha256 = "HisJsG27UvVbe0w8zzZArqioQQRxfuK2TPEWggV3TNA="; }; buildInputs = [ diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 49a3a5478cf..ab97090e889 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q"; + sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8"; }; bass_fx = { diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 9913631e854..5c71d079aa2 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.5.11"; + version = "0.6.8"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4CYbL+ICabKvpfjlALJ0wRbuwgy+JKJnKqYbQFsHQsI="; + sha256 = "sha256-wtgD8txViYu7yXdnID6TTf4gCDmvebD19XRxFnubndY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index ec90d0086c9..1cc19277522 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "jgm"; repo = pname; rev = version; - sha256 = "sha256-SU31kJL+8wt57bGW5fNeXjXPgPeCXZIknZwDxMXCfdc="; + sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # https://github.com/commonmark/cmark/releases/tag/0.30.0 + # https://github.com/commonmark/cmark/releases/tag/0.30.1 # recommends distributions dynamically link "-DCMARK_STATIC=OFF" ]; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index a16cb628008..37180580421 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "eigen"; - version = "3.3.7"; + version = "3.3.9"; src = fetchFromGitLab { owner = "libeigen"; repo = pname; rev = version; - hash = "sha256-oXJ4V5rakL9EPtQF0Geptl0HMR8700FdSrOB09DbbMQ="; + sha256 = "sha256-JMIG7CLMndUsECfbKpXE3BtVFuAjn+CZvf8GXZpLkFQ="; }; patches = [ diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/development/libraries/eigen/include-dir.patch index 7f3bd88557e..42f8e189c0b 100644 --- a/pkgs/development/libraries/eigen/include-dir.patch +++ b/pkgs/development/libraries/eigen/include-dir.patch @@ -8,7 +8,16 @@ # guard against in-source builds -@@ -408,13 +408,6 @@ install(FILES +@@ -407,7 +407,7 @@ set(PKGCONFIG_INSTALL_DIR + CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" + ) + +-foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) ++foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + if(IS_ABSOLUTE "${${var}}") + message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") + endif() +@@ -429,13 +429,6 @@ install(FILES DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) @@ -22,7 +31,7 @@ add_subdirectory(Eigen) add_subdirectory(doc EXCLUDE_FROM_ALL) -@@ -510,8 +503,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) +@@ -531,8 +524,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) set ( EIGEN_DEFINITIONS "") diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index c413cf277c8..b61505f60e6 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.2"; + version = "2.4.3"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; + sha256 = "0hxvd6xbvgq1rk8851gswffmvh3fv41lyvz4fhwzln7m12759yw8"; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6cd651e66eb..720c274ad52 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.15.2"; + version = "0.15.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg"; + sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 4e28f84bacd..7fb93a61a0f 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; + checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; preConfigure = '' mkdir -p build/external/src diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ccf03ccabdc..e138c824a44 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { # probably included in > 1.16.0 + name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969"; + sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; + }) (fetchpatch { # gpg: Send --with-keygrip when listing keys name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 00d3c4a5637..2bf843241a6 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.38.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0hjp946x5695srmc6bg2m7iih81jdmhpxn4bjcl80f09v4qsb0nl"; + sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd"; fetchSubmodules = true; }; patches = [ diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 2d439db5934..24bec8ec350 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.5"; + version = "1.12.6"; src = fetchFromGitHub { - sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4="; + sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 7be5f8b4000..fdcc2ae0081 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,35 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }: let llvm = llvmPackages.llvm; - clang = llvmPackages.clang; clang-unwrapped = llvmPackages.clang-unwrapped; in -stdenv.mkDerivation { - name = "libclc-2019-06-09"; +stdenv.mkDerivation rec { + pname = "libclc"; + version = "11.0.1"; src = fetchFromGitHub { - owner = "llvm-mirror"; - repo = "libclc"; - rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2"; - sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7"; + owner = "llvm"; + repo = "llvm-project"; + rev = "llvmorg-${version}"; + sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags"; }; + sourceRoot = "source/libclc"; - nativeBuildInputs = [ python3 llvm ]; - - strictDeps = true; - + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch postPatch = '' - sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py - sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py + substituteInPlace CMakeLists.txt \ + --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' ''; - configurePhase = '' - ${python3.interpreter} ./configure.py --prefix=$out - ''; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ninja python3 ]; + buildInputs = [ llvm clang-unwrapped ]; + strictDeps = true; meta = with lib; { homepage = "http://libclc.llvm.org/"; diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/development/libraries/libcprime/default.nix new file mode 100644 index 00000000000..4db6ac1b46b --- /dev/null +++ b/pkgs/development/libraries/libcprime/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, libnotify +, cmake +, ninja +, qtbase +, qtconnectivity +}: + +mkDerivation rec { + pname = "libcprime"; + version = "4.2.2"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtconnectivity + libnotify + ]; + + meta = with lib; { + description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 324e675f33b..04137eb02e7 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libkeyfinder"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "libkeyfinder"; rev = "v${version}"; - sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv"; + sha256 = "sha256-4jbnsKMGJKUIRfRPymGGgqPgwPyLInc6rLvCXnOcQ5g="; }; # needed for finding libkeyfinder.so to link it into keyfinder-tests executable diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index aa42edfeadb..04eca2759a8 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.19"; + version="0.3.20"; name="${baseName}-${version}"; - hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8="; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz"; - sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8="; + hash="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE="; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.20/libmwaw-0.3.20.tar.xz"; + sha256="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index fe02a96a565..99c8b735294 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0="; + sha256 = "sha256-Ut6tXaM97R8Y5D2dV/xPvxVzS6Ep6fOKAujtRNKoQCc="; }; postPatch = '' diff --git a/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/pkgs/development/libraries/libtiff/aarch64-darwin.nix new file mode 100644 index 00000000000..5de481066f6 --- /dev/null +++ b/pkgs/development/libraries/libtiff/aarch64-darwin.nix @@ -0,0 +1,53 @@ +{ lib, stdenv +, fetchurl + +, pkg-config +, cmake + +, libdeflate +, libjpeg +, xz +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libtiff"; + version = "4.2.0"; + + src = fetchurl { + url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; + sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; + }; + + cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF"; + + # FreeImage needs this patch + patches = [ ./headers-cmake.patch ]; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) + + buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. + + enableParallelBuilding = true; + + doInstallCheck = true; + installCheckTarget = "test"; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format"; + homepage = "https://libtiff.gitlab.io/libtiff"; + changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + license = licenses.libtiff; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 035b0ab55ad..ea246790020 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -10,6 +10,8 @@ , zlib }: +#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix + stdenv.mkDerivation rec { pname = "libtiff"; version = "4.3.0"; diff --git a/pkgs/development/libraries/libtiff/headers-cmake.patch b/pkgs/development/libraries/libtiff/headers-cmake.patch new file mode 100644 index 00000000000..5a00502ef28 --- /dev/null +++ b/pkgs/development/libraries/libtiff/headers-cmake.patch @@ -0,0 +1,13 @@ +diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 ++++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 +@@ -42,6 +42,9 @@ + libtiffxx.map) + + set(tiff_HEADERS ++ tiffiop.h ++ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h ++ tif_dir.h + tiff.h + tiffio.h + tiffvers.h) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index b630fca1670..a3de139fb44 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,25 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.41.0"; + version = "1.42.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; + sha256 = "0f6mfbg750q26fa85nhmw2m0gyp8jcp1kyx9zn6lgi8bha5b7kny"; }; - patches = [ - (fetchpatch { - # Fixes out-of-bounds read in uv__idna_toascii() function - name = "CVE-2021-22918.patch"; - url = "https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae.patch"; - sha256 = "0fbjy0jh7r9nrd27ag1k6am6d8p5ih7p0ywvjn53nq4cyqdqxhi7"; - }) - ]; - postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index b6ef6fa49b2..151d4c7ee48 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -26,8 +26,12 @@ let NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - postInstall = "rm -rf ${placeholder "out"}/share/libwebsockets-test-server"; - disallowedReferences = [ stdenv.cc.cc ]; # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + postInstall = '' + rm -r ${placeholder "out"}/share/libwebsockets-test-server + ''; + + # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { description = "Light, portable C library for websockets"; diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index ce9a72f00c1..dfeaeed8ca8 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki"; + sha256 = "sha256-6MMQr0ynMmfZj+RFoKtLB/f1nTBfn9tcYpzyUwnfB3M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 5a5257168eb..11931199999 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,44 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, catch, cmake +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, fetchurl +, pkg-config }: -let - nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform; -in stdenv.mkDerivation rec { pname = "microsoft_gsl"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = "GSL"; rev = "v${version}"; - sha256 = "09f08lxqm00152bx9yrizlgabzpzxlpbv06h00z4w78yxywgxlgx"; + sha256 = "sha256-gIpyuNlp3mvR8r1Azs2r76ElEodykRLGAwMN4BDJez0="; }; - # build phase just runs the unit tests, so skip it if - # we're doing a cross build - nativeBuildInputs = [ catch cmake ]; - buildPhase = if nativeBuild then "make" else "true"; + patches = [ + # Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525 + (fetchurl { + url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch"; + sha256 = "sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ6uv0="; + }) + ]; - # https://github.com/microsoft/GSL/issues/806 - cmakeFlags = lib.optionals stdenv.cc.isGNU - [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtest ]; - installPhase = '' - mkdir -p $out/include - mv ../include/ $out/ - ''; + doCheck = true; meta = with lib; { description = "C++ Core Guideline support library"; longDescription = '' - The Guideline Support Library (GSL) contains functions and types that are suggested for - use by the C++ Core Guidelines maintained by the Standard C++ Foundation. - This package contains Microsoft's implementation of GSL. + The Guideline Support Library (GSL) contains functions and types that are suggested for + use by the C++ Core Guidelines maintained by the Standard C++ Foundation. + This package contains Microsoft's implementation of GSL. ''; - homepage = "https://github.com/Microsoft/GSL"; - license = licenses.mit; - platforms = platforms.all; + homepage = "https://github.com/Microsoft/GSL"; + license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ]; }; } diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d9c82f79bb3..211821e084c 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.12"; + version = "0.16.2"; src = fetchurl { - url = "mirror://sourceforge/opende/ode-${version}.tar.bz2"; - sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; + url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; + sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj"; }; meta = with lib; { description = "Open Dynamics Engine"; - homepage = "https://sourceforge.net/projects/opende"; + homepage = "https://www.ode.org"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index c5a83f782f4..9398c4d2f36 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70="; excludes = [ "ChangeLog" ]; }) + # fix a minor bug + # https://gitlab.com/hepcedar/yoda/-/merge_requests/45 + (fetchpatch { + name = "yoda-fix-yodascale-for-gz.patch"; + url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff"; + sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs="; + }) ]; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 26558502c12..f22878ec829 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -7,19 +7,28 @@ , libtiff , curl , gtest +, fetchpatch }: stdenv.mkDerivation rec { pname = "proj"; - version = "8.0.1"; + version = "7.2.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "sha256-pgmv/mtqpKbgU1RuKtue7NAnMyXR1BwGJwoeA/MTrpY="; + sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; }; + patches = [ + (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557 + name = "gie_self_tests-fail.diff"; # included in >= 8.0.1 + url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; + sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; + }) + ]; + postPatch = lib.optionalString (version == "7.2.1") '' substituteInPlace CMakeLists.txt \ --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index fe0616b7d7a..e1e69b9f10b 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; }; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 7914af08df6..bd6ebbd8e37 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_ROOT=$(out)" ]; - enableParallelBuilding = true; - dontWrapQtApps = true; meta = { diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 28c16e32535..fc2ef6c09a6 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -34,7 +34,6 @@ in stdenv.mkDerivation rec { ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so ''; - enableParallelBuilding = true; dontWrapQtApps = true; postPatch = '' diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5cfca8d80c7..5d8688cfdc7 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -125,6 +125,12 @@ let url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch"; sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2"; }) + # Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch"; + name = "qtwebengine-everywhere-src-5.15.5-_1904652.patch"; + sha256 = "01q7hagq0ysii1jnrh5adm97vdm9cis592xr6im7accyw6hgcn7b"; + }) ] ++ optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index ce69c855ac2..0fd21a1a296 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; setOutputFlags = false; - enableParallelBuilding = true; NIX_QT_SUBMODULE = true; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 79e494a053b..f81a02303a6 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,23 +1,20 @@ -{ - lib, stdenv, - fetchFromGitHub, - gfortran, - cmake, - shared ? true +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, cmake +, shared ? true }: -let - inherit (lib) optional; -in stdenv.mkDerivation rec { pname = "liblapack"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${version}"; - sha256 = "sha256-B7eRaEY9vaLvuKkJ7d2KWanGE7OXh43O0UbXFheUWK8="; + sha256 = "sha256-ewYUM+M7jDO5LLnB4joiKkqgXjEDmWbFZbgad8x98gc="; }; nativeBuildInputs = [ gfortran cmake ]; @@ -30,8 +27,7 @@ stdenv.mkDerivation rec { "-DLAPACKE=ON" "-DCBLAS=ON" "-DBUILD_TESTING=ON" - ] - ++ optional shared "-DBUILD_SHARED_LIBS=ON"; + ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"; doCheck = true; @@ -58,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; + maintainers = with maintainers; [ ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index c676f8f0174..c2a8ae0337a 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tidyp"; version = "1.04"; - src = fetchFromGitHub { - owner = "petdance"; - repo = "tidyp"; - rev = version; - sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc"; + src = fetchurl { + # downloads from a legacy GitHub download page from ~11 years ago + # project does not work with autoconf anymore and the configure script cannot be generated from the source download + url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; + sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 3b6362f7396..37d82b0b4bd 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -10,13 +10,13 @@ with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R53"; + version = "R54"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr"; + sha256 = "01jym2rq28j0g792yagk9dvm411gwmk6qgj9rgrg7ckpxmw27w2s"; }; patches = [ diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 735cc278deb..5340306de79 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { propagatedBuildInputs = packages; preferLocalBuild = true; -} // { + # For compatability with XFree86. - buildClientLibs = true; + passthru.buildClientLibs = true; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 1d12e0f2b01..a5299f865d5 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "h3"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; rev = "v${version}"; - sha256 = "1ccyzbvbacf0bl9av4yp15zmhiqr3679nnbab11yrhxm9csyal16"; + sha256 = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 4d039770ce0..d3603266bea 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -43,7 +43,7 @@ python27Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ]; + propagatedBuildInputs = [ deps.oildev python27Packages.configargparse ]; patchPhase = '' for file in resholve; do diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 498f41bc1b3..c632a4cbc1e 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -46,6 +46,17 @@ let ''; }; + fast-cli = super.fast-cli.override ({ + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/fast \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium + ''; + }); + hyperspace-cli = super."@hyperspace/cli".override { nativeBuildInputs = with pkgs; [ makeWrapper @@ -68,10 +79,6 @@ let meta.broken = since "10"; }; - "fast-cli-1.x" = super."fast-cli-1.x".override { - meta.broken = since "10"; - }; - jshint = super.jshint.override { buildInputs = [ pkgs.phantomjs2 ]; }; @@ -94,14 +101,6 @@ let meta.mainProgram = "bw"; }); - fast-cli = super."fast-cli-1.x".override { - preRebuild = '' - # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore - sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js - ''; - buildInputs = [ pkgs.phantomjs2 ]; - }; - flood = super.flood.override { buildInputs = [ self.node-pre-gyp ]; meta.mainProgram = "flood"; @@ -218,12 +217,12 @@ let # remove node_ name prefix (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch"; - sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh"; + sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8="; }) # set meta platform (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; - sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n"; + sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h"; }) ]; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f529212b081..1bf813952ea 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -90,7 +90,7 @@ , "eslint_d" , "esy" , "expo-cli" -, {"fast-cli": "1.x"} +, "fast-cli" , "fauna-shell" , "firebase-tools" , "fixjson" @@ -178,6 +178,7 @@ , "np" , "npm" , "npm-check-updates" +, "npm-merge-driver" , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"} , "ocaml-language-server" , "parcel-bundler" @@ -226,6 +227,7 @@ , "stf" , "stylelint" , "svelte-language-server" +, "svelte-check" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3abbf3d0abd..8c972680895 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.5" = { + "@babel/cli-7.14.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz"; - sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.8.tgz"; + sha512 = "lcy6Lymft9Rpfqmrqdd4oTDdUx9ZwaAhAfywVrHG4771Pa6PPT0danJ1kDHBXYqh4HHSmIdA+nlmfxfxSDPtBg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.6" = { + "@babel/core-7.14.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz"; - sha512 = "gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz"; + sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.5" = { + "@babel/generator-7.14.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz"; - sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz"; + sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg=="; }; }; "@babel/helper-annotate-as-pure-7.14.5" = { @@ -418,13 +418,13 @@ let sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.6" = { + "@babel/helper-create-class-features-plugin-7.14.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz"; - sha512 = "Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz"; + sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.14.5" = { @@ -499,13 +499,13 @@ let sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.5" = { + "@babel/helper-module-transforms-7.14.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; - sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; + sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA=="; }; }; "@babel/helper-optimise-call-expression-7.14.5" = { @@ -553,13 +553,13 @@ let sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; }; }; - "@babel/helper-simple-access-7.14.5" = { + "@babel/helper-simple-access-7.14.8" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; - sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; + sha512 = "TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { @@ -580,13 +580,13 @@ let sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.5" = { + "@babel/helper-validator-identifier-7.14.8" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; - sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -607,13 +607,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.6" = { + "@babel/helpers-7.14.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz"; - sha512 = "yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; + sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; }; }; "@babel/highlight-7.14.5" = { @@ -634,13 +634,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.7" = { + "@babel/parser-7.14.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz"; - sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz"; + sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1399,13 +1399,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.7" = { + "@babel/preset-env-7.14.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz"; - sha512 = "itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz"; + sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1489,13 +1489,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.6" = { + "@babel/runtime-7.14.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz"; - sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; + sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; }; }; "@babel/runtime-7.9.0" = { @@ -1507,22 +1507,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.7" = { + "@babel/runtime-corejs3-7.14.8" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz"; - sha512 = "Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz"; + sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w=="; }; }; - "@babel/standalone-7.14.7" = { + "@babel/standalone-7.14.8" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.7.tgz"; - sha512 = "7RlfMPR4604SbYpj5zvs2ZK587hVhixgU9Pd9Vs8lB8KYtT3U0apXSf0vZXhy8XRh549eUmJOHXhWKTO3ObzOQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz"; + sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q=="; }; }; "@babel/template-7.14.5" = { @@ -1534,13 +1534,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.7" = { + "@babel/traverse-7.14.8" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz"; - sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz"; + sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg=="; }; }; "@babel/types-7.13.12" = { @@ -1552,13 +1552,13 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.5" = { + "@babel/types-7.14.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz"; - sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz"; + sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1795,166 +1795,166 @@ let sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.57" = { + "@electron-forge/async-ora-6.0.0-beta.58" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.57.tgz"; - sha512 = "pinf6bB5etIKNwFgMx2V+kwsFlkjU4mApALv0Jn/lmcH5dlAB4zPwuKTccC44xVO4pp/bV1HWb1XJ4lHVxYaJg=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.58.tgz"; + sha512 = "osJoCA+Mxda0ToHnVh0c52UiqG0vYRChFp7YZnXSOFAyv/pJhO1gaSfJeTX+2ddki0SLvWQbgiJS5ysMax6Veg=="; }; }; - "@electron-forge/core-6.0.0-beta.57" = { + "@electron-forge/core-6.0.0-beta.58" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.57.tgz"; - sha512 = "pLYG0QefjAEjxRazgEjryb4TrxVeebGTqXqZsKOpABAlDaKU4EmBq06SeSu8H9IAzMPwzpDIa6PaXdkMclqhnA=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.58.tgz"; + sha512 = "mro6o/Oa2BETPfnzlWcpLJ5W5IWVuDokE7HZPzb9c6OTlcm/BWwl8pbfSZU19Q9SLsjou9hAuMwqzFveZRqGew=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.57" = { + "@electron-forge/installer-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.57.tgz"; - sha512 = "qeQMUos0WADEddSGhViCUeMswsFz1IL+elIy5h06AxgjoRtOU75VVy9RgVfDAMIN0iKvEWNKLQz1CBUtVAt0fA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.58.tgz"; + sha512 = "VXA9cjCy9HHWyOcPGkO1Q5ym63AAfBLj/dL0Ezpw9r0/GKbgAN0g8HWgTwvs+rqWCdOAeyhIs+sTNI0rZQjc+A=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.57" = { + "@electron-forge/installer-darwin-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.57.tgz"; - sha512 = "3dsa948r3gCkD+ooKeGwWSUyh5GEJ7ngi9t1dRD+f1jUnkU1e3SqcGXH68dr5NYn3OcsFDWreK3xvx/1qdEQAg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.58.tgz"; + sha512 = "yfx97cL7+kB77xTeniNqRT4Va++uJX6j9kZwIwgaBFvtyLHZ1DChOlOI8IR6/qctzEtrZHW41DySFKXnsWYwuw=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.57" = { + "@electron-forge/installer-deb-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.57.tgz"; - sha512 = "Dnm68RUwR0UEe1hq1OPWso0LwdkZTa7Rpv0m9bHl+IvXTmrU//S5fdHEtjHAmto8f8PD5VadsLQcxsc3bQVNGQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.58.tgz"; + sha512 = "Ukw1ccUtmTOKCiorYLJCAIWGT5zxpinH1W9UpxlMP3JhrzQXApm2rF7n9TEGowkTMtPciEsNXaF/F9lzjRqIpQ=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.57" = { + "@electron-forge/installer-dmg-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.57.tgz"; - sha512 = "kmAYga2yY5JcrRI3Dtpau5Ldsebzs4pGkCCBJqq5asqgDGdCpw+8Cky6ouJDaZMl853C0CEnqxeoGYDTAlVBKA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.58.tgz"; + sha512 = "zw46CQSZ2Jihx7GBUcEPHGBQJD1pIBv6oTi5HPR7IkEJ7CQ/yjESAfDuu1UfQc9mgAKI+6s+QMuFZMW+ZMqYPg=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.57" = { + "@electron-forge/installer-exe-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.57.tgz"; - sha512 = "hVh4vh2q7BxJ8npsVCSxSdoUMwQwcs0LidbanXK8CqHmTgnb9MNDSHomCxOnX+kMQX85mCj9Nc5ROviXnLN4Xg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.58.tgz"; + sha512 = "Z7gl1CX8WJ/9kr5As9y0GELK8/u754j7bzSlxmaeyhaO/vSf5+M/MjkEiPUQUKVmqZ77ngdzN/T4IfDGxpk++A=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.57" = { + "@electron-forge/installer-linux-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.57.tgz"; - sha512 = "MTK4wLCWxYctzo/htghNhZ5ptIf46AE3UdeQItjiEhL4+KjJjQN8JAVkl40WeM+rUDA53WRQ35HeykNBmspb6A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.58.tgz"; + sha512 = "39A2mmhsJg2MEjYS+gtF/9FUYLKEoVmD6e4S+Rn0u9Yv/WOtdqOR0KR/pLYPtsiQKsGQA5nD2V2/ZN8N/qTxZw=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.57" = { + "@electron-forge/installer-rpm-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.57.tgz"; - sha512 = "cTzL6mwkhKEkl4v7NE2ATaEsptf5OhTbtwb/tRVIuEOblYKTxw3x9nnH8iGJ73xPW/54awGiU1kHJTKA6UhcUA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.58.tgz"; + sha512 = "RyuKOGJoJknnp1C9WPFDc06Jw9K+KBM574byYegNiJPm5eGu+ZL/4tU9hD29YAtImyoGUy8L5dquApaC4d9zKA=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.57" = { + "@electron-forge/installer-zip-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.57.tgz"; - sha512 = "ip/mlC32/mdUzFsM/39cZWshLN1B1f6atYHd2OpXlyAz6IZWrRHdsrJGtYsGdpgeoV/wMm09MTyuKXku3ehPaQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.58.tgz"; + sha512 = "J71WhNtHdgFDNCYB2vm3vv4Zt/rCuXFgtXxXRowb+pT39wxyL35DjXsOi/a6j5Vb2lGq0mekMuHvpcD/4MSo8w=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.57" = { + "@electron-forge/maker-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.57.tgz"; - sha512 = "VnoSCeyCHBv9q0Bz9JRgKC1b4k3z/Qb2T9DrpMqEVW6ClZVkOAZVmjyEtb+Xn8DnRPc4UtSjpAquycC/AZJ4MQ=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.58.tgz"; + sha512 = "Ztbv99kznlOAK/iDM03Hu/XmdTEXmfLnkcfAJ+uBlRwJmFqiAcPWNlUrPWtCu5KKxHcOiDl6mN3OC/Ae2/3fMA=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.57" = { + "@electron-forge/plugin-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.57.tgz"; - sha512 = "lErdgdSGd+HcIzXsZC1Pf6VuLYsDVHTwFUzuZqUPdl28AOWKfwW+XpIZoPMDt2/Mdd5K0mCcYSylikcSa8RHYA=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.58.tgz"; + sha512 = "RMRjw8iRqkPChSMKdTSWCSubvDMSdJx+9Q9eO8n3GRN0jx4ExizhSIkxWpLSuze5dPyJXm3i24YUZjKOAR21EA=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.57" = { + "@electron-forge/publisher-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.57.tgz"; - sha512 = "eJFVt4JI/zCw86PMu/LERMAMVcPchyFfZ9upFec4YuOOMLaJH1NvbO3gGgYj7vavH1hQWZA6Yn7u8b+E8y8Byw=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.58.tgz"; + sha512 = "pnAZ7VXnL0vosYn4Au347WukXVTU0XLqUSQrjC4pYCMs7YumL4n+ya+JNy51D6SkcFMmd0nCU2ohz7IHo3ttcg=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.57" = { + "@electron-forge/shared-types-6.0.0-beta.58" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.57.tgz"; - sha512 = "8jRAf7HsfQC5BA8MTOwh8cXmqJ8JJqzO7WzDW9A50tHOKbpBxPW9YM8036SZzZ4GNZYBSWmJt3d3vW+KFLeYXg=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.58.tgz"; + sha512 = "Kz21kMg+EnINGK3H6qW4YXjFbXYvRv24O8PBnVaQiFXYIaUOXpaXj42QeytDXR/zMSA/jy78GoGodJLKE+gbdA=="; }; }; - "@electron-forge/template-base-6.0.0-beta.57" = { + "@electron-forge/template-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.57.tgz"; - sha512 = "3Nc7ik99VHQK8eTUrO/lA2tMRM5a0fLX+GgjR32yzkaAv081qd6t/XWS7MfU3k5Ld5cYMturUywJnEP/QdxOvA=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.58.tgz"; + sha512 = "U2iT2YUY9R2wz9RNkM9dAEzv5q+b3HSDJcqPy/B7lzT3lB9kni0HZTZKihZttlQYGRO6jj+9aWnLqaE3HmtgsQ=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.57" = { + "@electron-forge/template-typescript-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.57.tgz"; - sha512 = "NhcyTaLjbBGtdCTkAJgazKR4B9+yNFNH8QiXm3u6bg0cv2MhPWydmPuiEjFRLqG+Vz6jS4sW6jSIyCjFRK42ow=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.58.tgz"; + sha512 = "x3dJeB4VDg18c69GOOUSk0LFRygaN2fDYxxjTZcGMlnsUTyypXkuaVIoEnMnB01TlY+gTPrsoITeB2e7ahSyaQ=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.57" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.57.tgz"; - sha512 = "S9AzVLB02AvOwEOtQvtSJlv7BPZPSX3gdqwhoxPcTP6Pi/hOvVeEweptkwwRzGsZmSI7/ifi1bq7avhnzjasZw=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.58.tgz"; + sha512 = "PTh0TW+ohn7BT+jjdQ3ubqFU9biP2ilfA36vA1Dgnv9/N8P1IBoEtXFJ4ilsMZOAfbp344ja9vsTFG+qGTsiDw=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.57" = { + "@electron-forge/template-webpack-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.57.tgz"; - sha512 = "df4/jHKcZ6+8qIE+h2U9Ej5P36uGQZjI8+CcIPDE/46avHT+BwCmlMA/ZTGUQ787U9WkoMiI7122jdd7GNyuCQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.58.tgz"; + sha512 = "Uf7Ck17bn3djuoSglzOioXhOBRqY72pqMSZF0K84zNGwfzsW/KSonizmOMG3yrvSDEQf48JE5Ezhssla3SSgiA=="; }; }; "@electron/get-1.12.4" = { @@ -2038,15 +2038,6 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@eslint/eslintrc-0.4.2" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; - sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg=="; - }; - }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -2506,13 +2497,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.0" = { + "@google-cloud/pubsub-2.16.1" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz"; - sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; + sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2668,6 +2659,15 @@ let sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ=="; }; }; + "@grpc/grpc-js-1.3.6" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.6.tgz"; + sha512 = "v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4018,6 +4018,15 @@ let sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; }; + "@malept/cross-spawn-promise-2.0.0" = { + name = "_at_malept_slash_cross-spawn-promise"; + packageName = "@malept/cross-spawn-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; + sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; + }; + }; "@mapbox/node-pre-gyp-1.0.5" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -4162,13 +4171,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.5" = { + "@netlify/build-16.1.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.5"; + version = "16.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz"; - sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-16.1.0.tgz"; + sha512 = "FEPgiR2IoEC7fwCkAguMdWbiWwdAr6Zh1+mEFlgqTPAQDE6j/ji3elD8kuXwtdHHhC8U28YYOTZL6fCodlvRAw=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4180,13 +4189,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-12.6.0" = { + "@netlify/config-13.0.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "12.6.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-12.6.0.tgz"; - sha512 = "L+ZmoGsO2Gql+T6+147G7ZctcXgViuh8Q1ReADICM4xdaYVmipRFC+ICU4iJ8I9UQnc0M7qM0ZHzKuhTdPJfiA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz"; + sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4225,6 +4234,123 @@ let sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; }; }; + "@netlify/local-functions-proxy-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy"; + packageName = "@netlify/local-functions-proxy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-0.1.0.tgz"; + sha512 = "n4Y3LE3I6MrSCCLqLjY4VOVAi/uXdU35Kswd0eK0060Fla5huj+rKSnzu8GIERrvuRJMPi/AY7WFxB5mkFS8qw=="; + }; + }; + "@netlify/local-functions-proxy-darwin-arm64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; + packageName = "@netlify/local-functions-proxy-darwin-arm64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-0.1.0.tgz"; + sha512 = "QsVber2F4H2zS2Oi31y226zeLkhWQrjy+9lYV4bsU0lZB9wHqrLGQNlOabqs6MWUQmWMqcDHLv31XMFpfhndnw=="; + }; + }; + "@netlify/local-functions-proxy-darwin-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; + packageName = "@netlify/local-functions-proxy-darwin-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-0.1.0.tgz"; + sha512 = "7Wb3ooicvRzHMErMWF+L+QG+rVy7iBEQ7b2GOzywL/VmeajatVk/D16v5b9adM2sX0KX1dyj3O9x2QLkDW2G7w=="; + }; + }; + "@netlify/local-functions-proxy-freebsd-arm64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; + packageName = "@netlify/local-functions-proxy-freebsd-arm64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-0.1.0.tgz"; + sha512 = "Keno1p1rvp5fiGEDZDm0fIOZTbcE1QwyqF5hgVSpD0bxitSAFOaXZwhcyo80x8qcMlBqQp9zWEJWu4zN1UiZMA=="; + }; + }; + "@netlify/local-functions-proxy-freebsd-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; + packageName = "@netlify/local-functions-proxy-freebsd-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-0.1.0.tgz"; + sha512 = "kyEjE/aW/k7yD1+Oy28LLZjg6W8091HPCqUHzCk5GzT46zvR61vTPfeAEQwNaEL2uFHPJ3SauDNUZ1+U+FNlHA=="; + }; + }; + "@netlify/local-functions-proxy-linux-arm-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-arm"; + packageName = "@netlify/local-functions-proxy-linux-arm"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-0.1.0.tgz"; + sha512 = "Un4RIA3xaiWT1njCMgYJsYc1etksFuARz8suHtcoKadsEJ1XICh6OzJoCO3AdHCN1kMQlo3cVC/sHoAB2EyEqw=="; + }; + }; + "@netlify/local-functions-proxy-linux-arm64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; + packageName = "@netlify/local-functions-proxy-linux-arm64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-0.1.0.tgz"; + sha512 = "ZDdy+5fgpHxFqpKghtJuMyyQ5tKWV+LJm6t8tKlXkAgC1n1GuqeWNP0JqHV8DSSShFHRaRNoBVpLoXJbtNIorQ=="; + }; + }; + "@netlify/local-functions-proxy-linux-ia32-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; + packageName = "@netlify/local-functions-proxy-linux-ia32"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-0.1.0.tgz"; + sha512 = "vR1qlu341JKN91t0TPsYt2xC+ug8Bjp/WCqMtARmFT9jaL8NBTm6kiUh89QcGILYCo2hMNcYb9eih8y5D4N5Iw=="; + }; + }; + "@netlify/local-functions-proxy-linux-ppc64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; + packageName = "@netlify/local-functions-proxy-linux-ppc64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-0.1.0.tgz"; + sha512 = "pcAPe+PzFkNrHpICvrIHHfxk5KNIVo3GgZKoI67NXECCtVel48aXitvlcOwsodrejD8ruQkfbvossBQs9Deq8A=="; + }; + }; + "@netlify/local-functions-proxy-linux-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-x64"; + packageName = "@netlify/local-functions-proxy-linux-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-0.1.0.tgz"; + sha512 = "sjlMLoKNJRJnq8Esk+GkxEk9CByDNouKdeQ+doiiQhYGRjLhKXZdXbaC137z2tm/vHhI/94Lg7mhCcGygitJpA=="; + }; + }; + "@netlify/local-functions-proxy-openbsd-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; + packageName = "@netlify/local-functions-proxy-openbsd-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-0.1.0.tgz"; + sha512 = "Dn9wQfeAU6FvurFo8eJL2scahtVigQyAi6lpV+c4YLD87WUfmiQ/mVgB7dfYB9zMiq5GO/iXbcK6wWjFyAZ6Aw=="; + }; + }; + "@netlify/local-functions-proxy-win32-ia32-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; + packageName = "@netlify/local-functions-proxy-win32-ia32"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-0.1.0.tgz"; + sha512 = "LRz6UZpgS0UzB5IKgOvBnVNkpBcnzRfT4YBBSBL31fucJ1J2c0zGJIUTqbFdS8eBLOS9Npq2qUT7qlnrgAWyMw=="; + }; + }; + "@netlify/local-functions-proxy-win32-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-win32-x64"; + packageName = "@netlify/local-functions-proxy-win32-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-0.1.0.tgz"; + sha512 = "YYzVpBPsAiup/Jg+kCAi0/EsV80BMF6JkQ3/2JjJhUqRuEG99THA+HwrFpsQOpOnr3niJBY93YrQymnJPgrk3A=="; + }; + }; "@netlify/open-api-2.5.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; @@ -4234,13 +4360,13 @@ let sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.21" = { + "@netlify/plugin-edge-handlers-1.11.22" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.21"; + version = "1.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.21.tgz"; - sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.22.tgz"; + sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; "@netlify/plugins-list-2.19.3" = { @@ -4252,13 +4378,13 @@ let sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; }; }; - "@netlify/routing-local-proxy-0.30.2" = { + "@netlify/routing-local-proxy-0.31.0" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.2"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; - sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.31.0.tgz"; + sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -4279,58 +4405,58 @@ let sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg=="; }; }; - "@node-red/editor-api-1.3.5" = { + "@node-red/editor-api-2.0.1" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.5.tgz"; - sha512 = "IJyfyVhEvkf2YNRPoR+1SPSi76evVV/boAKhOeVoIMBBeuYd1wM1ihMM3rnNWDYXjN/7CbTKz2DVmdMQ5aCIeQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.1.tgz"; + sha512 = "0+wY8FJvS6P3hiRnz7YzjWmkannoJyBMYgnSevQ6euf8dABML5AOYThghpMNPrtl+RzRIar0oabHrTRSoEpDEg=="; }; }; - "@node-red/editor-client-1.3.5" = { + "@node-red/editor-client-2.0.1" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.5.tgz"; - sha512 = "B/JB7KuSeTHkiwzrQtCgmkUfHN5nP2htUoE4wkTt118IA/1xUWXEtl+WnT5aDLiFUyFI21q9Fl4BnDOa7JqLEw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.1.tgz"; + sha512 = "9YP0n+VFruudzZfcsTL0fofm7j/BYodKzQTqksL3ZlcZsB075O3d8zM8ZuoNlpj2CfROR/PZi7E72ucmNExzlQ=="; }; }; - "@node-red/nodes-1.3.5" = { + "@node-red/nodes-2.0.1" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.5.tgz"; - sha512 = "kLZOn8YDiDemJ/ufx0eagpmPPbUzLifgvoF1fHq9Jzf+K/xWtzDLHqNyLM6VSzo6QlCAnS939dU9kDb5G3fs3Q=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.1.tgz"; + sha512 = "op1gcV99xp/xZAVg1B+VRzylNpWk/oF//I6dcRqiF8xoXjff42VfIJ8l01/JqsvuJD3p9+x9fz82QRMmASOu+w=="; }; }; - "@node-red/registry-1.3.5" = { + "@node-red/registry-2.0.1" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.5.tgz"; - sha512 = "wy74xMnD87v/oB5P/HnUiJ6kTgdcCTgIJadeRBh0DSwcMjG3MhSxe8QCk3U9BxLH1fxw0IwxWbNgGwzuM8EOdw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.1.tgz"; + sha512 = "B2La0qWpSEqbiiBWVmUKTqS4y/c/pZuUDPu7a5ZibGgcUEe032X05uZ68wIYMt1y2/ltnUlrPSdOjjpzpxEhEQ=="; }; }; - "@node-red/runtime-1.3.5" = { + "@node-red/runtime-2.0.1" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.5.tgz"; - sha512 = "4Cz83wX9trvhhPxFkF5HfYzqYQEcVOYf4f1lSDHP2xYowE22+x4BTCs8gZA4hCI4kbon3eyaU5NrzlrKd+nZbQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.1.tgz"; + sha512 = "3MbJk5Xum38Nt13FIvDmsuQYcdo5uxzKu2khHbXN3hG7XlECALSaKqLq19t7yg6e8q8Jqnb7j6184A1m34GVqQ=="; }; }; - "@node-red/util-1.3.5" = { + "@node-red/util-2.0.1" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.5.tgz"; - sha512 = "1TTvTwvGMSe9SQMEKN5zGdyGMv8Kth49eiUcdPnUWigtafk1BE9iP7gVSyLVYgijzCwh40GUkSYey0TUaSbRBw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.1.tgz"; + sha512 = "gT+3cI134m2pD4U0/iKuOAjRqluPXKlS19eCE06ArWGLxHmqx7Gi6Cyjxu971gNcw69QEfwJzEA2xIrAKRAR+g=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -4630,13 +4756,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-8.3.0" = { + "@octokit/openapi-types-9.1.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "8.3.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz"; - sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.0.tgz"; + sha512 = "XBP03pG4XuTU+VgeJM1ozRdmZJerMG4tk6wA+raFKycC4qV9jtD2UQroAg9bAcmI3Q0zWvifeDGtPqsFjMzkLg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4666,13 +4792,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.4.1" = { + "@octokit/plugin-rest-endpoint-methods-5.5.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.1.tgz"; - sha512 = "Nx0g7I5ayAYghsLJP4Q1Ch2W9jYYM0FlWWWZocUro8rNxVwuZXGfFd7Rcqi9XDWepSXjg1WByiNJnZza2hIOvQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.0.tgz"; + sha512 = "v4dNoHF8cXNx7C67yQx7oarHs5Wg2IiafWvp/ULkNcCOuXgQdBOkJtwidpYqPiRPUw4uHDkI6Tgfje+nXB+Deg=="; }; }; "@octokit/request-5.6.0" = { @@ -4693,22 +4819,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.7" = { + "@octokit/rest-18.7.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.7"; + version = "18.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.7.tgz"; - sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.0.tgz"; + sha512 = "8K8BJFyPFRSfnwu+aSbdjU5w3EtxC33PkDlEi5tyVTYC+t4n7gaqygRg5ajJLCpb/ZzVaXXFJXC9OxQ9TvFRAw=="; }; }; - "@octokit/types-6.19.0" = { + "@octokit/types-6.21.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.19.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz"; - sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.0.tgz"; + sha512 = "VPSxn9uhCoOUMpxCsOAQhf8DgIx+uzFjZRYDiZS5+TvrKaEwBrWkjr/5NmUVvPbW6xdPC2n3yL3XCnoxa4rxvg=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4765,310 +4891,310 @@ let sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; }; }; - "@ot-builder/bin-composite-types-1.0.11" = { + "@ot-builder/bin-composite-types-1.1.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.11.tgz"; - sha512 = "EZaye0ulSh5+SVBSz8loz+EOT+wEhrn5hqL3mGYMVMIXHf/JNexwB1n/uffbENfmRQcFLp+GRlVhsEyw+k2HdA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.1.0.tgz"; + sha512 = "/JaR3T99LHJWzOp08qLE9yTpe+v9DlgyE/ZwSyueG/fbzfCquHve9qgOaIP/yEiVNhQdMEBMsJdpQyicL6db3w=="; }; }; - "@ot-builder/bin-util-1.0.11" = { + "@ot-builder/bin-util-1.1.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.11.tgz"; - sha512 = "pH7MhJDe3WjlkPsbnUz+nLJedIpDhwqgCPKUDmyLeVaS+JD/+gRERRWDPycywzOwusHlHD6GBMDT68Phy9BuCw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.1.0.tgz"; + sha512 = "Cwk6FsYU9aJmmbFcrE1DI3t+FzdyTb6IotsCY1YAxnS4nEkj70bNRfDbxu4rzpPqBgndIjAz1FSXtlSayW0LMw=="; }; }; - "@ot-builder/cli-help-shower-1.0.11" = { + "@ot-builder/cli-help-shower-1.1.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.11.tgz"; - sha512 = "vGn9lGxBBknfGLYQ97fUd6fujTkv8IcOUJtsAG6VlMeu4BdMUNsSeAWX7nA/ZWrKPblBSV9E/H8TbiLwLcOWwg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.1.0.tgz"; + sha512 = "0KaiPVXkjyuBhHZK5/1fxGX7Ch0/YAmc/+Os3QSwH8xgN2O682TZhW+TaKJzGLe6wuTomQ0H3YzO5Z4PfIyx3g=="; }; }; - "@ot-builder/cli-proc-1.0.11" = { + "@ot-builder/cli-proc-1.1.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.11.tgz"; - sha512 = "icbfgW3eXE7G7sK6MxIzyUkeCoJxW3UCVXCyhQKgs7MVgQo/xEl6Mj04YE2fz62L+IsTccEdvMIFJXWUPjw44g=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.1.0.tgz"; + sha512 = "NiFyLMF6YCSum5gvqTWYZai2by0ULkOAX41bRdyoq9i+bq2vLQAisCdo3jZ6rjAWHO+zo4YTvcTyj2ukfABycw=="; }; }; - "@ot-builder/cli-shared-1.0.11" = { + "@ot-builder/cli-shared-1.1.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.11.tgz"; - sha512 = "PBdRmB3Mp5mHCxd889UJHq0eJwHUJiiSMY+M9VXfxgu4WxbA0NUY5IpiEs69RnfJhiSUjvdkiaWH5xJzB9+mdA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.1.0.tgz"; + sha512 = "rMsvIZHPc6RPSX1V2XJWM0fO/stSLctRMQZPnoPWQFcChS8Xvjf7iCBD8NA7V07LUI/8hYrcb4DMzp6aoJ4/pg=="; }; }; - "@ot-builder/common-impl-1.0.11" = { + "@ot-builder/common-impl-1.1.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.11.tgz"; - sha512 = "7FCjFJb32++fIlPpXzzuNZB7TtrwkYKB32VOBlVz/u/wGAI3DcQEeG4jqAIF9XOUb9jtISQUcEUj7YHDYdOKWQ=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.1.0.tgz"; + sha512 = "Gnm1eCD2UMSXJhqoqK4vEGGIqVHKch+UF6VBO6uezT7vzdHfTW/IltIaB5ukbT4wumQfRMuZs9Eb6cabNae+hg=="; }; }; - "@ot-builder/errors-1.0.11" = { + "@ot-builder/errors-1.1.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.11.tgz"; - sha512 = "hNMMJRVYNLgue0tYY2FKEk1RZmUKm4eY3CzoBOkhCNG7FAS1M2m2MGeE/TNaxxlJz3VTEiSXl1uMaFKXQLgrWw=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.1.0.tgz"; + sha512 = "88O6kaLJSWv+n1rboJ/lFEWEs3gRlABlLbqEgUX/tXqVs3cineH7ZZlBDpoNvVYnYV53KzReh8P0P4MIQklejQ=="; }; }; - "@ot-builder/io-bin-cff-1.0.11" = { + "@ot-builder/io-bin-cff-1.1.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.11.tgz"; - sha512 = "gcD/FhE6s6Xk2AIurJh8cXjwdB7N1hLhQFf8YkOGgZ4jX1lpSmm9Dx7GrwYx9iii7LodXBDVS5AJh4N+hpaESw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.1.0.tgz"; + sha512 = "bLVT7VnEViiKjL2emb1GbWwybBN0qkfqWgZgkdZJEU930nlnY//FsQhKrpZDW6A9vce7GiwuZaxeSETexF0/ug=="; }; }; - "@ot-builder/io-bin-encoding-1.0.11" = { + "@ot-builder/io-bin-encoding-1.1.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.11.tgz"; - sha512 = "5ytVt41rCuyDKi6XCrKOIaW88xf8b3gTKzjSvTRvYcsK/0uqJocpdbB7OIGU2TqpUNVuEs3IktDpMBiUrcFjuw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.1.0.tgz"; + sha512 = "77cYkXoJxfrDfjXkVIGuCHy/E+ff+t5E2zABHIFLoNmpXJvJdjYPupM/roMKkHqWjhnIP6caEwdCuxt3e8UNHA=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.11" = { + "@ot-builder/io-bin-ext-private-1.1.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.11.tgz"; - sha512 = "BwG9QBsPebZR1ycakpAYHc1zuCpKcpDr9pxp6D7kNSZAaZsosVinqI1cW0h/AbK99TYblI1MN4+FA2c4DJxWAg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.1.0.tgz"; + sha512 = "EwaHkGdP53bEXm7drrwrD6u63kSHw0A4NX+5xzhsIqDV24LShsZ9t34O2Pby9pN9jCJJFIWN3ryXEq3sHny4cA=="; }; }; - "@ot-builder/io-bin-font-1.0.11" = { + "@ot-builder/io-bin-font-1.1.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.11.tgz"; - sha512 = "xtGq9iU48CUAB/xm+a9wsvWKd2K4K637SqRjc9y0jou0h9TZ3g9fDF6RRCva1VJkAPHT4gJes6wALMuoLb9lfg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.1.0.tgz"; + sha512 = "PslL6SFENEGtQ6zOXMewl69cOibOLLzrr8CS2Pe78zNcxJ4BWsP6dwZNeu8gVqWKLsUQJQIWbwaPiP/RDhQKUQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.11" = { + "@ot-builder/io-bin-glyph-store-1.1.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.11.tgz"; - sha512 = "ipBYDaX7jsLiaJgpbyrTxeLqCB55KZ3UumVfxxTt8AUEKT1m6PUnG9BvaLBzvZxyjBF0sfiJDVQaS+mznbVj0Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.1.0.tgz"; + sha512 = "ontsdJHI6dY1N0HKzdwLIb0o9G5Q+S1ETADuShP/nQD0lV3cxxj1KS/PnFE/LSoyY0AKrs630kLV1lrMS3R4rg=="; }; }; - "@ot-builder/io-bin-layout-1.0.11" = { + "@ot-builder/io-bin-layout-1.1.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.11.tgz"; - sha512 = "5oquyNtdX/hRmtnmcgvdy0rxFiC1sqjRIi+6ycPNtMvJx9Z7z5USplveTf14W53Iyr/qGBsbk0QfNmv++fWEiQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.1.0.tgz"; + sha512 = "QEW3kR/Tu1Qtp3f6zrmQKGGeRD6daTpuBwjS4AnR47WhGHLZ9IJxVsNMHJeyYwnjXAWg6Tht5HjHGnI9dKnSDA=="; }; }; - "@ot-builder/io-bin-metadata-1.0.11" = { + "@ot-builder/io-bin-metadata-1.1.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.11.tgz"; - sha512 = "JdUp6qrHAfaa8UsCOKnWRveUiQGqa7QYQaPNLKaOVKvzo6jdIKB5uELX+GOc6qQU5ktGIjRuCbKWq2jZxcZToQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.1.0.tgz"; + sha512 = "PjeEoquOsI2mwg3MZL4VDRlzmWVA5LBeYKAY3LH140WOPYFlPN27YfWGVUO/swc98Z+5xgDZau3emj3ElSRvrw=="; }; }; - "@ot-builder/io-bin-metric-1.0.11" = { + "@ot-builder/io-bin-metric-1.1.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.11.tgz"; - sha512 = "5mjN6J6hOO7TDUazjI8Hl0eCkogLsod0N1u38UAVL4JmDAVEY6NCwYXVe0TDoNBRG17jfoOW+/xoz40uCI37AA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.1.0.tgz"; + sha512 = "mVjDTkxn6ARu7UUMi7rQCNC+fYK7IgSuO2bmYdzuozP7EmEWI5VQq3rhhMHDlvTodEuNARKJxr/tmzcB5Tx7PQ=="; }; }; - "@ot-builder/io-bin-name-1.0.11" = { + "@ot-builder/io-bin-name-1.1.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.11.tgz"; - sha512 = "SjeUgpDTPIqGo/lA7ACvk/L2SAIzzMfKs4WV+QYRh6hzN9IRfhoj2OYepxXpvInOiNj9FHqTzEnYz5l7mskqmw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.1.0.tgz"; + sha512 = "EBQLOP5LFdU18crQuNRQ4lWBzLv3Dw2R8vTvlyUY8nX8OfVUE2KhBreyTjMYTZATfNA2Ey1ZzJPhbT5LpwHg8Q=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.11" = { + "@ot-builder/io-bin-sfnt-1.1.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.11.tgz"; - sha512 = "/AhSr/xsXEDY8mCVO+yJTmOKwaUjVuhKtJ9kZrJymV8I7xm1gJjdH+JdTPtikhm36Mc9WWC+KY/2zot+pN2PtQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.1.0.tgz"; + sha512 = "SO0kgwif/7idUMT/Oo8J2N1iwIY98FKtl3yKSFYegiGrMqmL4qYGq26NxCt1NgpQyyZrMQV3D5eC81EpmvEy/Q=="; }; }; - "@ot-builder/io-bin-ttf-1.0.11" = { + "@ot-builder/io-bin-ttf-1.1.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.11.tgz"; - sha512 = "euZnFeumI9V21VmezT7yVNFYm2HuBJhWhy9JE8V9aaoIo2Qj5lVpMu+3WAuhCDp1qk2fs+o5JlI83lXrdWeWmQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.1.0.tgz"; + sha512 = "jlyLDuCocNq43uX2wGLspoJ/t901ywgO5OTIfx/x8hg4ka6TKlC13bi0bSvaiVNB6HpDO62GJ69gufRaSCEzvQ=="; }; }; - "@ot-builder/ot-1.0.11" = { + "@ot-builder/ot-1.1.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.11.tgz"; - sha512 = "TARoyL9D+i6gEzIijuh2C4MG4rNjY+Jkk1L5yMM/cVnzhLTy4PY+bTkszf2GJgcNi8iH8+XL213oHUOcEN8gWg=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.1.0.tgz"; + sha512 = "9ikUYwiE5ur7l89Ki7uDscMYWm1bxvuRzeWJoMr7thxibtnlMl6rVW5H6NspjEbOZmxgAf3YmiL3oPCq/jiewA=="; }; }; - "@ot-builder/ot-encoding-1.0.11" = { + "@ot-builder/ot-encoding-1.1.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.11.tgz"; - sha512 = "Z6ZIuIq+R9E+2HpvrBsXVXTkjJLWWyJgBssTl1n5DRF8nIWIwmKufoCjMXHMtCCMHMK8jlDCCv8U3AAhPjvAZQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.1.0.tgz"; + sha512 = "2x/lVIxC42XJdNB9BhvKq3P/bO1yomTwkLVcBS9R92x6/V1t4KOVCYHOtNL79lCGfZkdCWxHxtHhChF55BetsQ=="; }; }; - "@ot-builder/ot-ext-private-1.0.11" = { + "@ot-builder/ot-ext-private-1.1.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.11.tgz"; - sha512 = "7dOIKMYaAEgYj6FtKCxWFqctNhT05zAaCVRRh6QVfOrQf7cldxmIVHW76aHa27eHTWPdtXWBxtb3eA0BVbEzHA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.1.0.tgz"; + sha512 = "MBMiz8RC8crmx7PB89G75y2nIue6+QkIiXGsx402ozlLQVgJe9YznV7dzUHlpLrPGFsbMYPRfZVTV4Ro+YAK0A=="; }; }; - "@ot-builder/ot-glyphs-1.0.11" = { + "@ot-builder/ot-glyphs-1.1.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.11.tgz"; - sha512 = "NuhRdeS6vJnV6HVUEUMKDrNxW1PHYS2IWRsz+Dtr2ffrQ/GXtX857MXeZPd8cTrH+i0arfQeIUJPY0ZRmvXlJA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.1.0.tgz"; + sha512 = "EURkR2aUUR4Zlhdx+SdvEAkA7Vx+2mRorozb4gySs5PNqbKq43uzgXIgz1Djq6wasN00KcJGlOjogIv1zKFBwg=="; }; }; - "@ot-builder/ot-layout-1.0.11" = { + "@ot-builder/ot-layout-1.1.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.11.tgz"; - sha512 = "x2K3Nnv5WVyOZ6b23p0fOPB5oMqNuj8UyNZ7OCpgZTMTFEXjrIvnkuWpjnYRd6JfWXAYF0vfZdBMHd7F0l+Y4A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.1.0.tgz"; + sha512 = "x07BUvdLmcU2w8V8JxiMzv1dI5ybkuDrvpVDuwSAL/eBsuDYf7/3i+ewvHv1WlqG9nQ0v2RJK48CicrCGhlpQw=="; }; }; - "@ot-builder/ot-metadata-1.0.11" = { + "@ot-builder/ot-metadata-1.1.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.11.tgz"; - sha512 = "yInNtU6UkmzXIGJYARl5VZcA63UOLP3xc6o0APkHwVQNN53e5nN35GFwaDbeaWYYe0uRq/7/bDzeVsqr2GaV0Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.1.0.tgz"; + sha512 = "zgUlAqDj8eCuizVbMN4CVA76m+PAUdl91tUO1JTAn5qt0Lo8kfnOWaFc/aU+Q8HD3RXENRpAjA3N3kBm05UNiQ=="; }; }; - "@ot-builder/ot-name-1.0.11" = { + "@ot-builder/ot-name-1.1.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.11.tgz"; - sha512 = "opSvFhUgrveV+cpOhKFnD/nrfNj3pbW6Z1mem1Rz/oWnrkx73g8kgDyip+8acW5h3iulYHGWL3XsKVOm4UpKug=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.1.0.tgz"; + sha512 = "mudNPddCD/UD+v1fuFdPv3CzHjVS9Jt4GJhQ7or5HsG3/dIQ9N8jfqtBXtSK5ePEgoUsfhPWN5do/cwd//GQQQ=="; }; }; - "@ot-builder/ot-sfnt-1.0.11" = { + "@ot-builder/ot-sfnt-1.1.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.11.tgz"; - sha512 = "w254e5eLINkwS00N0UY4UMTK4UCHN7/Oh8p7/e7INw6EaCR7Gg1j7VKnbU6Fldg2leHDQ939tkGSNIU6uHisKg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.1.0.tgz"; + sha512 = "iyz7npSWu5z9mgSnEjFkBFoOA4mKYIfbG27SGUWWWx0HWHI9cRoE+FHIcQOCJH0PmATvNCXMVfiCSPHesb57GA=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.11" = { + "@ot-builder/ot-standard-glyph-namer-1.1.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.11.tgz"; - sha512 = "bynoGWRfxaVhqF6SjQZn7Vo+ApmMePBQn7HRwcnsS3CxxSTzP+O9Z2FtoN7/NiaQiENWrciMkTsDY2VH6iBo4A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.1.0.tgz"; + sha512 = "2jyZCBOWmkKyLfU/EOS2AZjJ0Y0toqZqOb2vrIhQRUkli9cb1RyALxkOnP60IfGsD2SNa9yxZcEbS9RlRK8rvw=="; }; }; - "@ot-builder/prelude-1.0.11" = { + "@ot-builder/prelude-1.1.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.11.tgz"; - sha512 = "BM1TmmUrGsA/goZ8RIGpjvw18nRDeFEWC7wFel/i4hFQuCKbfgfKixEDJ2iKzVXm6nGUl7/7xWZ0pfu3ij6tuA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.1.0.tgz"; + sha512 = "ghZ04jh2z8WD4UdHJVXKTyjzAo7zUD4lyilrO17fKT3WqD/LW/2vKC7inwepELwVC03uT8xaVhnflF1rYGMzKg=="; }; }; - "@ot-builder/primitive-1.0.11" = { + "@ot-builder/primitive-1.1.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.11.tgz"; - sha512 = "Hh6QGMC0XuAfiLWl7Q0eZSAOoEqkO6BPO9d3OFAxaNg05ekRJBzVvtB3iSEkdigbmg1aZChTy4HDFRw9D5SmGw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.1.0.tgz"; + sha512 = "ob7od9Lr3nlGSM6v4xoM8krXuO2W0bOFfpog4Trsg6BArRz8zFfdFVjsZ8umxAhJX2z0Jroiq1nM8okdkw0TDQ=="; }; }; - "@ot-builder/rectify-1.0.11" = { + "@ot-builder/rectify-1.1.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.11.tgz"; - sha512 = "B3hzfmONslDbTtFqX+tKff6zlrDMVD1B0yyC44Sm8iP6OFt1HgPwNKyVUntEs3Wzod9SCCN/hOcRFAeaXTM5RA=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.1.0.tgz"; + sha512 = "nT6VP78JwQtLcyn+DEVp5Xv5bAi+6z9Y8QaaLYWCtv5AnY4aNN7VKwiK4v9Kag77BYDqYT7PI4et2tR5Pf4jSA=="; }; }; - "@ot-builder/stat-glyphs-1.0.11" = { + "@ot-builder/stat-glyphs-1.1.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.11.tgz"; - sha512 = "ldzOx2QtDKsqdQolgCM6cCRzCcdS/B46a4Emu3vuMRs2M0yNAoy4EzVkX6h0nEnTBcgq2NKFFL4BxWIG4la1ZQ=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.1.0.tgz"; + sha512 = "FquKCcC2/Z/cCV16vi+8DHoQzMdwaYSgvA8Hv4Djx3aYLyAmYe14ODfZF63RcW5uh7pZsG1c6u82bf1trwZr9g=="; }; }; - "@ot-builder/trace-1.0.11" = { + "@ot-builder/trace-1.1.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.11.tgz"; - sha512 = "feOrmdS9Tc0+lnXHtPsq2QfMpI4zQqsIOEBYzzGGK4UPrdwO1a7DhBLgOEJt1C8o7d+2QeLE8KJnB4NGgx6kHQ=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.1.0.tgz"; + sha512 = "1C2vziYWUYe2YzPEPfNIdqjXtVjl5we69EjX5q4ZZPbCFFoeWGRR54Zxgyp8V5GAvKz0Pn94nXGaFlfEdwk3jQ=="; }; }; - "@ot-builder/var-store-1.0.11" = { + "@ot-builder/var-store-1.1.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.11.tgz"; - sha512 = "kg1T34FaRepMJ7vgatiVSjScH1H9c2H87vPauNR6lft8oeMORUuowJyFIzeckfaKcUFm/0uip6H5zj8Bypu9Wg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.1.0.tgz"; + sha512 = "Q60yNeIDJiqlHIPDkqJJXZWN5zodkKQQv/5PpLIocKMdHrQVqltrTQ5QL+V42Nup1+BiGt1zmR+sO+uUa3A/Iw=="; }; }; - "@ot-builder/variance-1.0.11" = { + "@ot-builder/variance-1.1.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.11.tgz"; - sha512 = "p1VXo+2ZZl5SDMWPLTzz2rtIlfY3G3RgPDAdG4dwWPjH9PLtZlrWDLQR9SGmisAe3p1NIUQh82TD6X2a9XMnXA=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.1.0.tgz"; + sha512 = "azUnRrvj2LKkPTYWuiEFStbUEQWbaiI6F63SZOL8yIOEr5Jya/iZ33HeeGltx/jbCrLdboad5pBechG/QD44+w=="; }; }; "@parcel/fs-1.11.0" = { @@ -5314,13 +5440,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.53" = { + "@redocly/openapi-core-1.0.0-beta.54" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.53"; + version = "1.0.0-beta.54"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.53.tgz"; - sha512 = "n5WixBRb7oWS31v3/cdOW/eNXbr2M4N8+HjHfCA/oQX6Z4ZYqPOJCekw64sQ/fnUQMIQyT6fKqyaf+iO4tG7YA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.54.tgz"; + sha512 = "uYs0N1Trjkh7u8IMIuCU2VxCXhMyGWSZUkP/WNdTR1OgBUtvNdF9C32zoQV+hyCIH4gVu42ROHkjisy333ZX+w=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5467,13 +5593,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.13.4" = { + "@serverless/components-3.14.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.13.4"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz"; - sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz"; + sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA=="; }; }; "@serverless/core-1.1.2" = { @@ -5548,13 +5674,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.4.0" = { + "@serverless/utils-5.6.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.4.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.4.0.tgz"; - sha512 = "abEYhQ8Bgh48w/8uzvv8hlfOXsbkvTns3vuMU4THpb0nhbhqL7Y4AWf6z4wJFxcMd0yffkgUQWwSzYHwGJp3kA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.6.0.tgz"; + sha512 = "R3mb6DlPwrlo49fwQNz3YTQb2XJCxVui+s/olVBSdAh82fi8EbbjgkZkaLKB9ES7lV2MIr3jqrIWjYyGE/2Bgw=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -5890,13 +6016,13 @@ let sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A=="; }; }; - "@snyk/snyk-docker-pull-3.6.2" = { + "@snyk/snyk-docker-pull-3.6.3" = { name = "_at_snyk_slash_snyk-docker-pull"; packageName = "@snyk/snyk-docker-pull"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.2.tgz"; - sha512 = "Ngebbk2LLMYNj5iMeTrt066nzWZ3oc8I5aN5A1qXpXmuAv8hW/hA1pfF3qwWrskl0RbPIhcSnY833e8l+drjEQ=="; + url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.3.tgz"; + sha512 = "SXhIAVfBVB/WoMgh3pTJNEKehpHygzqnnqHpg3ucw2rc5z0LqSAJQyYWl3jSAUnl5LgA11UuYD8zj0dsRbed2A=="; }; }; "@snyk/snyk-hex-plugin-1.1.4" = { @@ -7204,6 +7330,15 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; + "@types/node-16.4.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz"; + sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7654,6 +7789,15 @@ let sha512 = "ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw=="; }; }; + "@types/ws-7.4.7" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "7.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.7.tgz"; + sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; + }; + }; "@types/yargs-13.0.12" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -7708,13 +7852,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.3" = { + "@typescript-eslint/eslint-plugin-4.28.4" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz"; - sha512 = "jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; + sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7726,13 +7870,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.3" = { + "@typescript-eslint/experimental-utils-4.28.4" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz"; - sha512 = "zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; + sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7744,22 +7888,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.3" = { + "@typescript-eslint/parser-4.28.4" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz"; - sha512 = "ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz"; + sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA=="; }; }; - "@typescript-eslint/scope-manager-4.28.3" = { + "@typescript-eslint/scope-manager-4.28.4" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz"; - sha512 = "/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; + sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7771,13 +7915,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.3" = { + "@typescript-eslint/types-4.28.4" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz"; - sha512 = "kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz"; + sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7789,13 +7933,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.3" = { + "@typescript-eslint/typescript-estree-4.28.4" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz"; - sha512 = "YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; + sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7807,13 +7951,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.3" = { + "@typescript-eslint/visitor-keys-4.28.4" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz"; - sha512 = "ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; + sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8941,6 +9085,15 @@ let sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; + "acorn-walk-8.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz"; + sha512 = "FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w=="; + }; + }; "adbkit-2.11.1" = { name = "adbkit"; packageName = "adbkit"; @@ -11227,13 +11380,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.948.0" = { + "aws-sdk-2.951.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.948.0"; + version = "2.951.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.948.0.tgz"; - sha512 = "UJaCwccNaNNFtbhlvg+BmcaVWNI7RPonZA16nca0s3O+UnHm5y5H/nN6XpuJp+NUrxrLgTFaztPvjmBp5q6p+g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.951.0.tgz"; + sha512 = "YPqhdESUzd4+pSuGJcfMnG1qNVbmZjnmsa85Z9jofR1ilIpuV31onIiFHv8iubM59ETok/+zy3QOmxRSLYzFmQ=="; }; }; "aws-sign2-0.6.0" = { @@ -12136,22 +12289,13 @@ let sha512 = "BR2vwQZwu24aRm588XHOnPVjjQtbK8sF0RopRFgMuke63/REJMWnePTa2YHKDBefuBYiVdgkowuB1/e4K7Ue3g=="; }; }; - "bcrypt-3.0.6" = { + "bcrypt-5.0.1" = { name = "bcrypt"; packageName = "bcrypt"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.6.tgz"; - sha512 = "taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg=="; - }; - }; - "bcrypt-3.0.8" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "3.0.8"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.8.tgz"; - sha512 = "jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw=="; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz"; + sha512 = "9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw=="; }; }; "bcrypt-nodejs-0.0.3" = { @@ -14458,15 +14602,6 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "callback-stream-1.1.0" = { - name = "callback-stream"; - packageName = "callback-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; - sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; - }; - }; "caller-0.0.1" = { name = "caller"; packageName = "caller"; @@ -14665,13 +14800,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001245" = { + "caniuse-lite-1.0.30001246" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001245"; + version = "1.0.30001246"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"; - sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; + sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA=="; }; }; "canvas-2.8.0" = { @@ -15187,15 +15322,6 @@ let sha1 = "5c710f2bab95653272842ba01c6ea61b3545ec35"; }; }; - "cheerio-0.22.0" = { - name = "cheerio"; - packageName = "cheerio"; - version = "0.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; - sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; - }; - }; "cheerio-1.0.0-rc.10" = { name = "cheerio"; packageName = "cheerio"; @@ -16420,13 +16546,13 @@ let sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; }; - "color-3.2.0" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.2.0.tgz"; - sha512 = "4ximSqKXLTQmYLJuvrRHtpOqniR+ASoaVK+Rxdy6ZpfsLvUqtIM7oGGgopRG+O4p9NRv/AfuVD3jsvdxyXqozQ=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; "color-convert-1.9.3" = { @@ -17365,13 +17491,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.97" = { + "constructs-3.3.99" = { name = "constructs"; packageName = "constructs"; - version = "3.3.97"; + version = "3.3.99"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.97.tgz"; - sha512 = "KDemmmUBgTDd2OKVOZkVEJM1LwP/bzm+cs2l/v1UYctIUl2X4LW+MrK7Ajd8blKkS5Vp6edkQSTSHUJnR/413w=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz"; + sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw=="; }; }; "consume-http-header-1.0.0" = { @@ -18140,13 +18266,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.9.0" = { + "create-gatsby-1.10.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.9.0.tgz"; - sha512 = "KYQnXV2uaZCUt3y4Kkh4hlBGg4LYc6XCEdp99CEfMKOCu34rte5+6c1EZRpphATLqdKIitdFlPp5dJm3knBeMA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz"; + sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q=="; }; }; "create-graphback-1.0.1" = { @@ -18194,15 +18320,6 @@ let sha512 = "Pb3XjZNKdCs0Nk46yFKb82y+a3xRQeMvGi1AlJfIV40y/iwkgBqzS5EfqdnakEOvh2jzTOx3v8QxZpkz4hPzyw=="; }; }; - "cron-1.7.2" = { - name = "cron"; - packageName = "cron"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; - sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; - }; - }; "cron-1.8.2" = { name = "cron"; packageName = "cron"; @@ -18212,6 +18329,15 @@ let sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; }; }; + "cronosjs-1.7.1" = { + name = "cronosjs"; + packageName = "cronosjs"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cronosjs/-/cronosjs-1.7.1.tgz"; + sha512 = "d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q=="; + }; + }; "cross-env-5.2.1" = { name = "cross-env"; packageName = "cross-env"; @@ -18302,6 +18428,15 @@ let sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; }; }; + "cross-spawn-windows-exe-1.2.0" = { + name = "cross-spawn-windows-exe"; + packageName = "cross-spawn-windows-exe"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz"; + sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; + }; + }; "crossroads-0.12.2" = { name = "crossroads"; packageName = "crossroads"; @@ -20813,6 +20948,15 @@ let sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; }; }; + "devtools-protocol-0.0.869402" = { + name = "devtools-protocol"; + packageName = "devtools-protocol"; + version = "0.0.869402"; + src = fetchurl { + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz"; + sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; + }; + }; "devtools-protocol-0.0.883894" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -21839,13 +21983,13 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; - "duplexify-4.1.1" = { + "duplexify-4.1.2" = { name = "duplexify"; packageName = "duplexify"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz"; - sha512 = "DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; + sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; }; }; "duration-0.2.2" = { @@ -22019,13 +22163,13 @@ let sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; }; - "electron-packager-15.2.0" = { + "electron-packager-15.3.0" = { name = "electron-packager"; packageName = "electron-packager"; - version = "15.2.0"; + version = "15.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz"; - sha512 = "BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA=="; + url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.3.0.tgz"; + sha512 = "PHcykXinmjPyJcYoNGbOWNsOU25nIbMLHBAfg4caazWzYELFL14FshDZEqqrvVOMEUnqjx/Ktc1NmMIN5ZRomQ=="; }; }; "electron-rebuild-2.3.5" = { @@ -22037,13 +22181,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.779" = { + "electron-to-chromium-1.3.782" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.779"; + version = "1.3.782"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.779.tgz"; - sha512 = "nreave0y/1Qhmo8XtO6C/LpawNyC6U26+q7d814/e+tIqUK073pM+4xW7WUXyqCRa5K4wdxHmNMBAi8ap9nEew=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; + sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23074,15 +23218,6 @@ let sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; - "eslint-7.30.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz"; - sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg=="; - }; - }; "eslint-7.31.0" = { name = "eslint"; packageName = "eslint"; @@ -23128,13 +23263,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.13.0" = { + "eslint-plugin-vue-7.14.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz"; - sha512 = "u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz"; + sha512 = "IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww=="; }; }; "eslint-scope-3.7.3" = { @@ -24127,15 +24262,6 @@ let sha512 = "94JMAXcBkBHYazc8y85akJQvq/7PFdBHOWc5B421liyQXdDzvq49ct4tbTHRnpOZ3aPlsufLGVQdhJIuGUNiTQ=="; }; }; - "express-session-1.17.1" = { - name = "express-session"; - packageName = "express-session"; - version = "1.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; - sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; - }; - }; "express-session-1.17.2" = { name = "express-session"; packageName = "express-session"; @@ -24352,15 +24478,6 @@ let sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ=="; }; }; - "extract-zip-1.7.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; - sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; - }; - }; "extract-zip-2.0.1" = { name = "extract-zip"; packageName = "extract-zip"; @@ -25009,13 +25126,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.1" = { + "file-type-16.5.2" = { name = "file-type"; packageName = "file-type"; - version = "16.5.1"; + version = "16.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz"; - sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz"; + sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw=="; }; }; "file-type-3.9.0" = { @@ -26260,15 +26377,6 @@ let sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }; }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; - }; - }; "fs-extra-10.0.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -26620,31 +26728,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.9.0" = { + "gatsby-core-utils-2.10.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.9.0.tgz"; - sha512 = "LKmkk4B/VnSEYKR9W/C8Lp9lwk/l/qY5jbsoiChc43F67VM667gITWH0noSUdcGzbEsN8xi0Wuc8dMA6BvKkvg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz"; + sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA=="; }; }; - "gatsby-recipes-0.20.0" = { + "gatsby-recipes-0.21.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.20.0.tgz"; - sha512 = "GsQOovAFImV3MtZVTTjv6utMRRo5QDC1+7l3Je3kqHz425J7UcmjMH/ZzHdzIZ1hO2/RUgGoFXAbWgqhipJp2g=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz"; + sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA=="; }; }; - "gatsby-telemetry-2.9.0" = { + "gatsby-telemetry-2.10.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.9.0.tgz"; - sha512 = "Ji40by9qHm9Zz2vKIBACT77awt0FpqKES9uT9nLmaqyiOZ/7Hs1dKwMrZ2yCkHNBh6S9RplcgfUQLq2LE4oeaA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz"; + sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg=="; }; }; "gauge-1.2.7" = { @@ -27358,13 +27466,13 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; - "glob-parent-6.0.0" = { + "glob-parent-6.0.1" = { name = "glob-parent"; packageName = "glob-parent"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz"; - sha512 = "Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz"; + sha512 = "kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog=="; }; }; "glob-slash-1.0.0" = { @@ -28682,15 +28790,6 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; "hasha-5.2.2" = { name = "hasha"; packageName = "hasha"; @@ -28925,13 +29024,13 @@ let sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; }; }; - "help-me-1.1.0" = { + "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; - version = "1.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; - sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz"; + sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; "here-0.0.2" = { @@ -29186,6 +29285,15 @@ let sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; }; }; + "hpagent-0.1.2" = { + name = "hpagent"; + packageName = "hpagent"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz"; + sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="; + }; + }; "hrpc-2.2.0" = { name = "hrpc"; packageName = "hrpc"; @@ -29997,13 +30105,13 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "i18next-15.1.2" = { + "i18next-20.3.2" = { name = "i18next"; packageName = "i18next"; - version = "15.1.2"; + version = "20.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-15.1.2.tgz"; - sha512 = "98ELn/dqep00DQ/v1E1gpM21HNN6nqU3mS85mYKd9P7lXrhfUcuysPaa3HviKSFb3WPdjf7avuAST3P0dhNp/A=="; + url = "https://registry.npmjs.org/i18next/-/i18next-20.3.2.tgz"; + sha512 = "e8CML2R9Ng2sSQOM80wb/PrM2j8mDm84o/T4Amzn9ArVyNX5/ENWxxAXkRpZdTQNDaxKImF93Wep4mAoozFrKw=="; }; }; "iconv-lite-0.4.23" = { @@ -30033,15 +30141,6 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "iconv-lite-0.6.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -30582,13 +30681,13 @@ let sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; }; }; - "ink-3.0.8" = { + "ink-3.0.9" = { name = "ink"; packageName = "ink"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.8.tgz"; - sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.9.tgz"; + sha512 = "BN+SyJ1rLbKzGPxGYkk22dYB0b58OtyMI4uN0dYucQ8MlIu5TpXJzaP6Bt8Mgqi1dkNZT55bjGyZ2iVLTkJ70w=="; }; }; "ink-spinner-4.0.2" = { @@ -33462,13 +33561,13 @@ let sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; - "jsii-srcmak-0.1.300" = { + "jsii-srcmak-0.1.302" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.300"; + version = "0.1.302"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.300.tgz"; - sha512 = "yTB5QIeh1RkiixLzoP3BJ49yiVXnjTGh4O7Ywsn4oxH0IK6e6uDdqn6woFwbBpRwbShixo4PIytpsE2X6hDGgw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz"; + sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg=="; }; }; "json-bigint-0.2.3" = { @@ -33777,13 +33876,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.267" = { + "json2jsii-0.1.272" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.267"; + version = "0.1.272"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.267.tgz"; - sha512 = "mo/Vagk6g+O5olk+K7AwukyrmNFuj/OyBNswmhbGUCmiNN/ddEIVcmCMx481FmYoewTKl0Axyt33iapt5IcxCg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz"; + sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q=="; }; }; "json3-3.2.6" = { @@ -34327,13 +34426,13 @@ let sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; }; }; - "katex-0.13.11" = { + "katex-0.13.13" = { name = "katex"; packageName = "katex"; - version = "0.13.11"; + version = "0.13.13"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz"; - sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz"; + sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; }; }; "keep-alive-agent-0.0.1" = { @@ -34354,15 +34453,6 @@ let sha512 = "5AsrYCiCHIUxuw/G2r7xcoTW/NTf5IFwAe1fkwf2ifM/KZzEojaTylh1Pppu60oEixww1rfcWJaRGLi3eAJsrQ=="; }; }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; "keyboardevent-key-polyfill-1.1.0" = { name = "keyboardevent-key-polyfill"; packageName = "keyboardevent-key-polyfill"; @@ -35137,13 +35227,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lighthouse-logger-1.2.0" = { + "lighthouse-logger-1.3.0" = { name = "lighthouse-logger"; packageName = "lighthouse-logger"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz"; - sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw=="; + url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz"; + sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; "lightning-3.3.12" = { @@ -35173,6 +35263,15 @@ let sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; + "lightning-3.4.0" = { + name = "lightning"; + packageName = "lightning"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.4.0.tgz"; + sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -35317,6 +35416,15 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; + "ln-service-51.10.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz"; + sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ=="; + }; + }; "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; @@ -35353,6 +35461,15 @@ let sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; }; }; + "ln-sync-0.4.7" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.7.tgz"; + sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; + }; + }; "ln-telegram-3.2.9" = { name = "ln-telegram"; packageName = "ln-telegram"; @@ -36037,15 +36154,6 @@ let sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267"; }; }; - "lodash.bind-4.2.1" = { - name = "lodash.bind"; - packageName = "lodash.bind"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"; - sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; - }; - }; "lodash.camelcase-4.3.0" = { name = "lodash.camelcase"; packageName = "lodash.camelcase"; @@ -36649,15 +36757,6 @@ let sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; - }; - }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -36667,15 +36766,6 @@ let sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; }; }; - "lodash.reject-4.6.0" = { - name = "lodash.reject"; - packageName = "lodash.reject"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"; - sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; - }; - }; "lodash.repeat-4.1.0" = { name = "lodash.repeat"; packageName = "lodash.repeat"; @@ -39790,15 +39880,6 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mkpath-1.0.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; - sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; - }; - }; "mobx-6.3.2" = { name = "mobx"; packageName = "mobx"; @@ -40096,13 +40177,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.6" = { + "mqtt-4.2.8" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz"; - sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.8.tgz"; + sha512 = "DJYjlXODVXtSDecN8jnNzi6ItX3+ufGsEs9OB3YV24HtkRrh7kpx8L5M1LuyF0KzaiGtWr2PzDcMGAY60KGOSA=="; }; }; "mqtt-packet-6.10.0" = { @@ -40591,24 +40672,6 @@ let sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; - "nan-2.13.2" = { - name = "nan"; - packageName = "nan"; - version = "2.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; - sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; - }; - }; - "nan-2.14.0" = { - name = "nan"; - packageName = "nan"; - version = "2.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; - }; - }; "nan-2.14.2" = { name = "nan"; packageName = "nan"; @@ -41727,15 +41790,6 @@ let sha1 = "e652bbf3885a04dad6a353d74176177c83914707"; }; }; - "node-phantom-simple-2.2.4" = { - name = "node-phantom-simple"; - packageName = "node-phantom-simple"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; - sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; - }; - }; "node-polyglot-1.0.0" = { name = "node-polyglot"; packageName = "node-polyglot"; @@ -41754,24 +41808,6 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-pre-gyp-0.12.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; - }; - }; - "node-pre-gyp-0.14.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; - }; - }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -41790,31 +41826,13 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-0.2.7" = { + "node-red-admin-2.2.0" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz"; - sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw=="; - }; - }; - "node-red-node-rbe-0.5.0" = { - name = "node-red-node-rbe"; - packageName = "node-red-node-rbe"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.5.0.tgz"; - sha512 = "88zuty5SiLW2/0vK8ZpMCoEBq2JbR4GEEIoJp3YWhQQytQRRvzHgOodzOkuH4AQoMFZXuVxF1lVswL6yiDCQiQ=="; - }; - }; - "node-red-node-tail-0.3.1" = { - name = "node-red-node-tail"; - packageName = "node-red-node-tail"; - version = "0.3.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-tail/-/node-red-node-tail-0.3.1.tgz"; - sha512 = "d/CbPGJMSNekJHOQu4WMNwjXRFnZ4c2+D3nlSdRH6wdUVVc++4nat8TuhcXKUe9W9+nqMrmVhReGnf8UwKsfBw=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.0.tgz"; + sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; }; }; "node-releases-1.1.73" = { @@ -43852,22 +43870,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.11" = { + "ot-builder-1.1.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.11.tgz"; - sha512 = "bexZrUc8L6R5N47kgD52vMP6mU4y+09VTc2ZqZD/0uktzY4ksXCEjLcRkHe9uEocmq2jtuPFtpoSTaO9mTxrhA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.1.0.tgz"; + sha512 = "IvQqHq33yHRKQuBzlzE6N3tXR2IktvBXeTvdASzib5Lqz84MJ1raGQrDNMimYxpRjcXZFJVfDgATYy5+gLhJIQ=="; }; }; - "otb-ttc-bundle-1.0.11" = { + "otb-ttc-bundle-1.1.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.11.tgz"; - sha512 = "Wx/WXWyvWnlyTBBZBxOJsEWbBxf8MdOXNmggISi+0l4o63jobEe3ZB5oCOMbNyJPynqv+JyyrroVDTOuzP3HAQ=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.1.0.tgz"; + sha512 = "tn3jkqHfaVIQsecQyAUTNf/VAAfE5EQiDH3AyIb1OFXjcdp0P9pBZUd0E4iP+rQjVoN8eMy1uCgvde5M5ZqVrg=="; }; }; "ow-0.21.0" = { @@ -45400,6 +45418,15 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; + "peek-readable-3.1.4" = { + name = "peek-readable"; + packageName = "peek-readable"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; + sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; + }; + }; "peek-readable-4.0.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -45463,13 +45490,13 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "perfect-scrollbar-1.5.1" = { + "perfect-scrollbar-1.5.2" = { name = "perfect-scrollbar"; packageName = "perfect-scrollbar"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.1.tgz"; - sha512 = "MrSImINnIh3Tm1hdPT6bji6fmIeRorVEegQvyUnhqko2hDGTHhmjPefHXfxG/Jb8xVbfCwgmUIlIajERGXjVXQ=="; + url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.2.tgz"; + sha512 = "McHAinFkyzKbBZrFtb4MT2mxkehp15KvOX/UrjB8C5EZZXHTHgyETo5IGFYtHRTI2Pb2bsV0OE0YnkjT9Cw3aw=="; }; }; "performance-now-0.2.0" = { @@ -45553,15 +45580,6 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "phantomjs-prebuilt-2.1.16" = { - name = "phantomjs-prebuilt"; - packageName = "phantomjs-prebuilt"; - version = "2.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; - sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; - }; - }; "phin-2.9.3" = { name = "phin"; packageName = "phin"; @@ -46084,13 +46102,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "pnp-webpack-plugin-1.6.4" = { + "pnp-webpack-plugin-1.7.0" = { name = "pnp-webpack-plugin"; packageName = "pnp-webpack-plugin"; - version = "1.6.4"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; - sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; + url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"; + sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="; }; }; "polished-4.1.3" = { @@ -46202,13 +46220,13 @@ let sha512 = "/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA=="; }; }; - "postcss-8.3.5" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "8.3.5"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; - sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; "postcss-calc-7.0.5" = { @@ -47525,15 +47543,6 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "promise-phantom-3.1.6" = { - name = "promise-phantom"; - packageName = "promise-phantom"; - version = "3.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; - sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; - }; - }; "promise-queue-2.2.5" = { name = "promise-queue"; packageName = "promise-queue"; @@ -48776,6 +48785,15 @@ let sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; }; }; + "puppeteer-9.1.1" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz"; + sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw=="; + }; + }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -49532,13 +49550,13 @@ let sha1 = "08c6e04a0168f6eb621c22ab6cb1151bd9f4a64d"; }; }; - "rcedit-2.3.0" = { + "rcedit-3.0.1" = { name = "rcedit"; packageName = "rcedit"; - version = "2.3.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz"; - sha512 = "h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ=="; + url = "https://registry.npmjs.org/rcedit/-/rcedit-3.0.1.tgz"; + sha512 = "XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw=="; }; }; "re-emitter-1.1.4" = { @@ -50180,13 +50198,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "rechoir-0.7.0" = { + "rechoir-0.7.1" = { name = "rechoir"; packageName = "rechoir"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; - sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"; + sha512 = "/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg=="; }; }; "record-cache-1.1.1" = { @@ -51224,13 +51242,13 @@ let sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; }; - "resolve-alpn-1.1.2" = { + "resolve-alpn-1.2.0" = { name = "resolve-alpn"; packageName = "resolve-alpn"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz"; - sha512 = "8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA=="; + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz"; + sha512 = "e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA=="; }; }; "resolve-cwd-2.0.0" = { @@ -51728,13 +51746,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.2" = { + "rollup-2.53.3" = { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -52097,6 +52115,15 @@ let sha1 = "182a991208fc1ab5214443eb250fc8f53b4bc9ea"; }; }; + "sade-1.7.4" = { + name = "sade"; + packageName = "sade"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz"; + sha512 = "y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA=="; + }; + }; "safe-buffer-5.0.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -52340,13 +52367,13 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; - "schema-utils-3.1.0" = { + "schema-utils-3.1.1" = { name = "schema-utils"; packageName = "schema-utils"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz"; - sha512 = "tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; + sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; }; "scoped-regex-2.1.0" = { @@ -53852,13 +53879,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.21.3" = { + "snyk-docker-plugin-4.22.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.21.3"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.21.3.tgz"; - sha512 = "u54T2ooQatEWeeFRgzpEl6PpyzEHjNU78VkMg2FarNzuNPdmVsE/Wb6rs8JsB8shTLS6jWp9XCY2zmkpr9Zgag=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.22.1.tgz"; + sha512 = "fpXGkBu69Vb5meSrq0KjSKr0nlibA8z18fuH/O8HuDh1b5XyqKNz412njybpJtW07JPpA9rKX9gewRBZWch6fQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -55346,13 +55373,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.20" = { + "sscaff-1.2.22" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.20"; + version = "1.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.20.tgz"; - sha512 = "D5a+kU//hvpNbXUxIdKmEkzdmdByB8AB2PVVWUrkh08bZPGSZfbTALrBclQDVuxtKbrCa5X6d7SqwM69OltT2Q=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz"; + sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA=="; }; }; "ssh-config-1.1.6" = { @@ -56624,13 +56651,22 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.2.0" = { + "strtok3-6.1.3" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.0"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.0.tgz"; - sha512 = "hBbPN4+f9fypbfTs0NImALgzYcb6k/blFr2mJVX6bUOmJCbXe/trDHdIC+Ir5XUXRMGFvq487ecwLitDoHVoew=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; + sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; + }; + }; + "strtok3-6.2.2" = { + name = "strtok3"; + packageName = "strtok3"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.2.tgz"; + sha512 = "iUzLl3UhF2RfqQah80JngnfltQFLEidGyTX8+hHFMQFjzUj3UpIpOx824FtFmRI9bwyywReENpdHGDkFJwJlGQ=="; }; }; "structured-source-3.0.2" = { @@ -58479,15 +58515,6 @@ let sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; "tmp-0.0.33" = { name = "tmp"; packageName = "tmp"; @@ -58776,6 +58803,15 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; + "token-types-3.1.0" = { + name = "token-types"; + packageName = "token-types"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz"; + sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ=="; + }; + }; "toml-2.3.6" = { name = "toml"; packageName = "toml"; @@ -59955,15 +59991,6 @@ let sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; }; }; - "uglify-js-3.13.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz"; - sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; - }; - }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -63115,13 +63142,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.8.0" = { + "vue-eslint-parser-7.9.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz"; - sha512 = "ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz"; + sha512 = "QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -63583,13 +63610,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-2.3.0" = { + "webpack-sources-2.3.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz"; - sha512 = "WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz"; + sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; "webpack-stream-6.1.0" = { @@ -63637,13 +63664,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.2.4" = { + "webtorrent-1.2.5" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.4.tgz"; - sha512 = "oQf2HYtylJSHlPX8FDqn79JEO2Og856X78oZHH3So7zJK0RlQVdDolH82MvjbrVxDv6Mfa7s1rIjPKcy+hQEFw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.5.tgz"; + sha512 = "EvtAQ3rK4c7Kf4ZGxYOGvi8Jih8qsZka1IgNB8T5Vxw5UzSNG1nxTVNNTXL0jFhQUMsyRwIOkTgd7ZkJY6bqsw=="; }; }; "well-known-symbols-2.0.0" = { @@ -64573,15 +64600,6 @@ let sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; }; }; - "ws-6.2.1" = { - name = "ws"; - packageName = "ws"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; - }; - }; "ws-6.2.2" = { name = "ws"; packageName = "ws"; @@ -64618,6 +64636,15 @@ let sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; }; }; + "ws-7.5.1" = { + name = "ws"; + packageName = "ws"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; + sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; + }; + }; "ws-7.5.3" = { name = "ws"; packageName = "ws"; @@ -65708,15 +65735,6 @@ let sha512 = "7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q=="; }; }; - "zen-observable-0.5.2" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; - sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q=="; - }; - }; "zen-observable-0.8.15" = { name = "zen-observable"; packageName = "zen-observable"; @@ -66600,7 +66618,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66914,7 +66932,7 @@ in sources."pump-3.0.0" (sources."pumpify-2.0.1" // { dependencies = [ - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."readable-stream-3.6.0" ]; }) @@ -67105,7 +67123,7 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -67130,7 +67148,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67169,7 +67187,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67196,7 +67214,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67371,7 +67389,7 @@ in dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."source-map-0.6.1" ]; }) @@ -67397,12 +67415,12 @@ in dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."tapable-2.2.0" ]; }) sources."webpack-node-externals-3.0.0" - (sources."webpack-sources-2.3.0" // { + (sources."webpack-sources-2.3.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -67444,12 +67462,12 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -67458,20 +67476,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -67538,7 +67556,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.14.5" @@ -67549,10 +67567,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -67605,13 +67623,13 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/through-0.0.30" - sources."@types/ws-7.4.6" + sources."@types/ws-7.4.7" sources."@vue/cli-shared-utils-4.5.13" (sources."@vue/cli-ui-4.5.13" // { dependencies = [ @@ -67748,7 +67766,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67876,7 +67894,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68769,12 +68787,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/generator-7.14.8" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.5" + sources."@babel/types-7.14.8" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -68850,12 +68868,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -68866,19 +68884,19 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -68886,7 +68904,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -68897,7 +68915,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68991,7 +69009,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -69026,9 +69044,9 @@ in }; dependencies = [ sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -69055,14 +69073,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69266,10 +69284,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.0.tgz"; - sha512 = "rJ29qKw5UMS5WM9hdur696oXNiuszSJLhYKMBQuHDuwITeuwNk9GYhXyXRVFFOKVNetjsP/HruSU6tZ3jBq4kQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz"; + sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69282,7 +69300,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69649,32 +69667,60 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.9.0" // { + (sources."ln-service-51.10.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.5" + sources."@grpc/grpc-js-1.3.6" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/request-2.48.6" - sources."@types/ws-7.4.6" + sources."@types/ws-7.4.7" sources."bn.js-5.2.0" sources."form-data-2.5.1" - sources."lightning-3.3.16" + sources."lightning-3.4.0" sources."ws-7.5.3" ]; }) - (sources."ln-sync-0.4.6" // { + (sources."ln-sync-0.4.7" // { dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/node-15.12.5" - sources."@types/ws-7.4.5" + sources."@grpc/grpc-js-1.3.6" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.3" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.7" + sources."bn.js-5.2.0" + sources."form-data-2.5.1" + sources."lightning-3.4.0" + ]; + }) + (sources."ln-telegram-3.2.9" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.5" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.2" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.6" sources."bn.js-5.2.0" sources."cbor-7.0.5" - sources."lightning-3.3.12" + sources."form-data-2.5.1" + sources."lightning-3.3.16" + sources."ln-service-51.9.0" + (sources."ln-sync-0.4.6" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/express-4.17.12" + sources."@types/node-15.12.5" + sources."@types/request-2.48.5" + sources."@types/ws-7.4.5" + sources."lightning-3.3.12" + ]; + }) + sources."ws-7.5.3" ]; }) - sources."ln-telegram-3.2.9" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -69797,7 +69843,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."proxy-addr-2.0.7" @@ -70515,10 +70561,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/parser-7.14.8" + sources."@babel/types-7.14.8" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -70977,7 +71023,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71411,7 +71457,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.97" + sources."constructs-3.3.99" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71484,13 +71530,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.300" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.267" + sources."json2jsii-0.1.272" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71526,7 +71572,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.20" + sources."sscaff-1.2.22" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71594,7 +71640,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { @@ -71641,7 +71687,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.97" + sources."constructs-3.3.99" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -71696,7 +71742,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.8" // { + (sources."ink-3.0.9" // { dependencies = [ sources."type-fest-0.12.0" ]; @@ -71760,7 +71806,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.300" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71843,7 +71889,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.20" + sources."sscaff-1.2.22" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -71851,22 +71897,12 @@ in sources."date-format-2.1.0" ]; }) - (sources."string-length-3.1.0" // { - dependencies = [ - sources."astral-regex-1.0.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."string-width-4.2.2" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - (sources."strip-ansi-6.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - ]; - }) + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."tar-stream-2.2.0" sources."type-fest-0.15.1" @@ -72144,10 +72180,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.8"; + version = "0.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.8.tgz"; - sha512 = "CjSVxlpHutTkycvsJyebL+7Om+okMCkffn6V2LC9/Ix68/RVTjhmvwmbZhVe8zg5G9uyjdNUW+UpDBQy/GAm9Q=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.11.tgz"; + sha512 = "L16wPMe5iDrprv5JNlTBtTd3WmRM+kLN9u+lQTDFpj0t6WxE16WzCm2Ktl1jzgpGY+xcdGakbZAL2y9bLXaJqg=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -72230,10 +72266,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.0.tgz"; - sha512 = "I2DcWVp/meb44yLAHrKvkLU869MLcwK1Tz87hk1W8+naD+9oMNvWBYjxQR7AU5l0WUB5SeCMuay63MFELhyPfA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.1.tgz"; + sha512 = "CgBUD5qPMvbdTUKTIaeKPxmJSieVJNK3JS1PPgr4ivIXqXYZ4ECP4DM7jmnkA+BnK9Xvz1FnlebUTxTv3z/IFQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72328,10 +72364,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz"; - sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.4.tgz"; + sha512 = "6/dloBU+OuRHO/YxX/vWYEFykCQSyN+ASTiwIw0O/l5CyDh9E967sLtodN9uH/MAyExOYfl5i65zI20CMZ6zDQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72654,14 +72690,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -72733,7 +72769,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -72831,14 +72867,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.30.0" // { + (sources."eslint-7.31.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; @@ -73630,10 +73666,10 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.156"; + version = "1.1.157"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.156.tgz"; - sha512 = "lPtMmvdxFMVKm7KYKWVDmYyQo1KpG7oOwre4WlKj4+TeWxhOfkxz2q1HtsoYeideu0X9Y6GCGNlBpeZbFMhP4g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.157.tgz"; + sha512 = "GyjrMQFSqrAnBB0SlZC93JV9E8VAcsDhfCBHZ6DIRDCH9qsSI3g0Y0RGJp7v+JHDDZTrEPJiiPOu1e/6PFA90A=="; }; dependencies = [ sources."pyright-1.1.157" @@ -73788,31 +73824,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73842,7 +73878,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73880,7 +73916,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74167,7 +74203,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -74282,14 +74318,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" @@ -74325,8 +74361,12 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.30.0" - sources."eslint-plugin-vue-7.13.0" + sources."eslint-7.31.0" + (sources."eslint-plugin-vue-7.14.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -74443,7 +74483,7 @@ in sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.8.0" // { + (sources."vue-eslint-parser-7.9.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -74656,10 +74696,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.4.0.tgz"; - sha512 = "8tSSnS8pjuw6Wtu/3Ufd2elV/3DnE3AUu3L+IYyukLoQNrRY9iS+Qfg3e1APokk7OzSghDkxW7yRZFiAoHF6FQ=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.0.tgz"; + sha512 = "iuaG85EDWIp02Dm1LZsi7vRE4CH5cRwo2+GaEEAi6fgX3dRLpt/jhQc7ylwXibi4kUjMvpV/xbMwjRRmGcg4NQ=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -74671,7 +74711,7 @@ in sources."color-string-1.6.0" sources."colors-1.4.0" sources."colorspace-1.1.2" - sources."commander-7.2.0" + sources."commander-8.0.0" sources."core-util-is-1.0.2" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" @@ -75336,14 +75376,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75714,7 +75754,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -76971,30 +77011,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.57.tgz"; - sha512 = "ouIL3FI6C0W3iLwwwQzKufjoP/OZagUDMCDjGLN/dqeg+lZ+cR40bdfaNTFha9ajz+zSe2SmhCOMVUVNNkJ5Sg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.58.tgz"; + sha512 = "dlGj8lrtUGOwoNaU/zEhbJMOEAqiZUcn9AJrX80saSplkkWEkOpoo4UkLJ256BLyK8nA1+k89pT/KMtFrUFcPg=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.57" - sources."@electron-forge/core-6.0.0-beta.57" - sources."@electron-forge/installer-base-6.0.0-beta.57" - sources."@electron-forge/installer-darwin-6.0.0-beta.57" - sources."@electron-forge/installer-deb-6.0.0-beta.57" - sources."@electron-forge/installer-dmg-6.0.0-beta.57" - sources."@electron-forge/installer-exe-6.0.0-beta.57" - sources."@electron-forge/installer-linux-6.0.0-beta.57" - sources."@electron-forge/installer-rpm-6.0.0-beta.57" - sources."@electron-forge/installer-zip-6.0.0-beta.57" - sources."@electron-forge/maker-base-6.0.0-beta.57" - sources."@electron-forge/plugin-base-6.0.0-beta.57" - sources."@electron-forge/publisher-base-6.0.0-beta.57" - sources."@electron-forge/shared-types-6.0.0-beta.57" - sources."@electron-forge/template-base-6.0.0-beta.57" - sources."@electron-forge/template-typescript-6.0.0-beta.57" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.57" - sources."@electron-forge/template-webpack-6.0.0-beta.57" + sources."@electron-forge/async-ora-6.0.0-beta.58" + sources."@electron-forge/core-6.0.0-beta.58" + sources."@electron-forge/installer-base-6.0.0-beta.58" + sources."@electron-forge/installer-darwin-6.0.0-beta.58" + sources."@electron-forge/installer-deb-6.0.0-beta.58" + sources."@electron-forge/installer-dmg-6.0.0-beta.58" + sources."@electron-forge/installer-exe-6.0.0-beta.58" + sources."@electron-forge/installer-linux-6.0.0-beta.58" + sources."@electron-forge/installer-rpm-6.0.0-beta.58" + sources."@electron-forge/installer-zip-6.0.0-beta.58" + sources."@electron-forge/maker-base-6.0.0-beta.58" + sources."@electron-forge/plugin-base-6.0.0-beta.58" + sources."@electron-forge/publisher-base-6.0.0-beta.58" + sources."@electron-forge/shared-types-6.0.0-beta.58" + sources."@electron-forge/template-base-6.0.0-beta.58" + sources."@electron-forge/template-typescript-6.0.0-beta.58" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.58" + sources."@electron-forge/template-webpack-6.0.0-beta.58" (sources."@electron/get-1.12.4" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77021,7 +77061,7 @@ in sources."universalify-0.1.2" ]; }) - sources."@malept/cross-spawn-promise-1.1.1" + sources."@malept/cross-spawn-promise-2.0.0" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -77029,7 +77069,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77108,6 +77148,11 @@ in sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" + (sources."cross-spawn-windows-exe-1.2.0" // { + dependencies = [ + sources."@malept/cross-spawn-promise-1.1.1" + ]; + }) sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" (sources."debug-4.3.2" // { @@ -77146,13 +77191,14 @@ in sources."debug-2.6.9" ]; }) - (sources."electron-packager-15.2.0" // { + (sources."electron-packager-15.3.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) (sources."electron-rebuild-2.3.5" // { dependencies = [ + sources."@malept/cross-spawn-promise-1.1.1" sources."fs-extra-9.1.0" ]; }) @@ -77449,7 +77495,7 @@ in sources."qs-6.5.2" sources."quick-lru-5.1.1" sources."rc-1.2.8" - sources."rcedit-2.3.0" + sources."rcedit-3.0.1" sources."read-pkg-2.0.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -77462,7 +77508,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" sources."responselike-2.0.0" @@ -77618,12 +77664,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -77635,17 +77681,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -77653,15 +77699,15 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77696,7 +77742,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77733,7 +77779,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77763,7 +77809,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.8" // { + (sources."ink-3.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -77886,7 +77932,7 @@ in }) sources."redent-3.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -77916,13 +77962,6 @@ in sources."escape-string-regexp-2.0.0" ]; }) - (sources."string-length-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."astral-regex-1.0.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -77983,7 +78022,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -79678,14 +79717,14 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.30.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz"; - sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; + sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79846,7 +79885,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79888,7 +79927,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.30.0" + sources."eslint-7.31.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -80034,7 +80073,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -80042,7 +80081,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -80055,24 +80094,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -80154,10 +80193,10 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-5.0.5" @@ -80577,7 +80616,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -80649,12 +80688,7 @@ in }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - (sources."color-3.2.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" @@ -80851,7 +80885,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81647,7 +81681,7 @@ in }) sources."plist-3.0.2" sources."pngjs-3.4.0" - sources."pnp-webpack-plugin-1.6.4" + sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { dependencies = [ sources."async-2.6.3" @@ -81903,7 +81937,7 @@ in }) sources."requires-port-1.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -81924,7 +81958,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -82259,7 +82293,7 @@ in sources."url-join-4.0.0" (sources."url-loader-4.1.1" // { dependencies = [ - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" ]; }) sources."url-parse-1.5.1" @@ -82457,7 +82491,7 @@ in sources."workbox-broadcast-update-6.1.5" (sources."workbox-build-6.1.5" // { dependencies = [ - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -82562,184 +82596,274 @@ in bypassCache = true; reconstructLock = true; }; - "fast-cli-1.x" = nodeEnv.buildNodePackage { + fast-cli = nodeEnv.buildNodePackage { name = "fast-cli"; packageName = "fast-cli"; - version = "1.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz"; - sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.0.1.tgz"; + sha512 = "QT3uBdxjHiXEz8iSAUJezETjKgTEP0PicHk36ga2veZHmIpqU5k+M0z1bmZ5G+EJHCN84o4w++fngJIgcj1Nqw=="; }; dependencies = [ - sources."ajv-6.12.6" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."array-find-index-1.0.2" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."bcrypt-pbkdf-1.0.2" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.7" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.8" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.8" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.8" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-syntax-jsx-7.14.5" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-transform-destructuring-7.14.7" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" + sources."@types/minimist-1.2.2" + sources."@types/node-16.4.0" + sources."@types/normalize-package-data-2.4.1" + sources."@types/yauzl-2.9.2" + sources."@types/yoga-layout-1.9.2" + sources."agent-base-6.0.2" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."arrify-1.0.1" + sources."astral-regex-2.0.0" + sources."auto-bind-4.0.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."brace-expansion-1.1.11" + sources."browserslist-4.16.6" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."cli-cursor-1.0.2" - sources."cli-spinners-1.3.1" - sources."co-4.6.0" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."caniuse-lite-1.0.30001246" + sources."chalk-2.4.2" + sources."chownr-1.1.4" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-truncate-2.1.0" + sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" - sources."currently-unhandled-0.4.1" - sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."colorette-1.2.2" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."convert-source-map-1.8.0" + sources."convert-to-spaces-1.0.2" + sources."debug-4.3.2" sources."decamelize-1.2.0" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."delay-5.0.0" + sources."devtools-protocol-0.0.869402" + sources."electron-to-chromium-1.3.782" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es6-promise-4.2.8" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."exit-hook-1.1.1" - sources."extend-3.0.2" - sources."extract-zip-1.7.0" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" + sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" - sources."find-up-1.1.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-1.0.0" + sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-stdin-4.0.1" - sources."getpass-0.1.7" - sources."graceful-fs-4.2.6" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."gensync-1.0.0-beta.2" + sources."get-stream-5.2.0" + sources."glob-7.1.7" + sources."globals-11.12.0" + sources."hard-rejection-2.1.0" sources."has-1.0.3" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."hasha-2.2.0" - sources."hosted-git-info-2.8.9" - sources."http-signature-1.2.0" - sources."indent-string-2.1.0" + sources."hosted-git-info-4.0.2" + sources."https-proxy-agent-5.0.0" + sources."ieee754-1.2.1" + sources."import-jsx-4.0.0" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" sources."inherits-2.0.4" + (sources."ink-3.0.9" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."ink-spinner-4.0.2" sources."is-arrayish-0.2.1" + sources."is-ci-2.0.0" sources."is-core-module-2.5.0" - sources."is-finite-1.1.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."kew-0.7.0" - sources."klaw-1.3.1" - sources."load-json-file-1.1.0" - (sources."log-symbols-2.2.0" // { + sources."is-fullwidth-code-point-3.0.0" + sources."is-plain-obj-1.1.0" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json5-2.2.0" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."loose-envify-1.4.0" + sources."lru-cache-6.0.0" + sources."make-dir-3.1.0" + sources."map-obj-4.2.1" + (sources."meow-9.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" + sources."type-fest-0.18.1" ]; }) - sources."log-update-1.0.2" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."meow-3.7.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."mkpath-1.0.0" - sources."ms-2.0.0" - sources."node-phantom-simple-2.2.4" - sources."normalize-package-data-2.5.0" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."onetime-1.1.0" - (sources."ora-1.4.0" // { + sources."minimist-options-4.1.0" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + sources."node-fetch-2.6.1" + sources."node-releases-1.1.73" + (sources."normalize-package-data-3.0.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."supports-color-5.5.0" + sources."semver-7.3.5" ]; }) - sources."os-tmpdir-1.0.2" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.2.0" + sources."patch-console-1.0.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-type-1.1.0" sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."phantomjs-prebuilt-2.1.16" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."process-nextick-args-2.0.1" - sources."progress-1.1.8" - sources."promise-phantom-3.1.6" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" - sources."redent-1.0.0" - sources."repeating-2.0.1" - sources."request-2.88.2" - sources."request-progress-2.0.1" + sources."pkg-dir-4.2.0" + sources."progress-2.0.3" + sources."prop-types-15.7.2" + sources."proxy-from-env-1.1.0" + sources."pump-3.0.0" + sources."puppeteer-9.1.1" + sources."quick-lru-4.0.1" + sources."react-16.14.0" + sources."react-devtools-core-4.14.0" + sources."react-is-16.13.1" + sources."react-reconciler-0.24.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" sources."resolve-1.20.0" - sources."restore-cursor-1.0.1" + sources."resolve-from-3.0.0" + sources."restore-cursor-3.1.0" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."scheduler-0.18.0" + sources."semver-6.3.0" + sources."shell-quote-1.7.2" sources."signal-exit-3.0.3" + (sources."slice-ansi-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."source-map-0.5.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.9" - sources."sshpk-1.16.1" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" - sources."strip-indent-1.0.1" - sources."supports-color-2.0.0" - sources."throttleit-1.0.0" - sources."tmp-0.0.31" - sources."tough-cookie-2.5.0" - sources."trim-newlines-1.0.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."typedarray-0.0.6" - sources."uri-js-4.4.1" + (sources."stack-utils-2.0.3" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."string-width-4.2.2" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" + sources."tar-fs-2.1.1" + sources."tar-stream-2.2.0" + sources."through-2.3.8" + sources."to-fast-properties-2.0.0" + sources."trim-newlines-3.0.1" + sources."type-fest-0.12.0" + sources."unbzip2-stream-1.4.3" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - sources."verror-1.10.0" - sources."which-1.3.1" + sources."widest-line-3.1.0" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-7.5.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" - sources."zen-observable-0.5.2" + sources."yoga-layout-prebuilt-1.10.0" + sources."zen-observable-0.8.15" ]; buildInputs = globalBuildInputs; meta = { - description = "Test your download speed using fast.com"; + description = "Test your download and upload speed using fast.com"; homepage = "https://github.com/sindresorhus/fast-cli#readme"; license = "MIT"; }; @@ -82757,17 +82881,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83385,12 +83509,12 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.16.0" // { + (sources."@google-cloud/pubsub-2.16.1" // { dependencies = [ sources."google-auth-library-7.3.0" ]; }) - sources."@grpc/grpc-js-1.3.5" + sources."@grpc/grpc-js-1.3.6" sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { @@ -83419,7 +83543,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83635,7 +83759,7 @@ in ]; }) sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -84345,7 +84469,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84525,7 +84649,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85212,10 +85336,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.9.0.tgz"; - sha512 = "mfd+e5dNzQ8CkjggrYw3PkQwizJmK1+hR6VWmstDkc5+h1c6xFFNFfauexllDFi8H1SMokAEV4TQRDYDilpByw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz"; + sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -85225,13 +85349,13 @@ in }) sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -85247,22 +85371,22 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -85270,11 +85394,11 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/runtime-7.14.6" - sources."@babel/standalone-7.14.7" + sources."@babel/runtime-7.14.8" + sources."@babel/standalone-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -85310,7 +85434,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85377,7 +85501,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -85438,7 +85562,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.9.0" + sources."create-gatsby-1.10.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -85473,7 +85597,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85485,13 +85609,12 @@ in sources."escape-string-regexp-1.0.5" sources."estree-util-is-identifier-name-1.1.0" sources."etag-1.8.1" - (sources."execa-3.4.0" // { + (sources."execa-5.1.1" // { dependencies = [ sources."cross-spawn-7.0.3" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -85526,7 +85649,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -85545,22 +85668,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.9.0" - (sources."gatsby-recipes-0.20.0" // { + sources."gatsby-core-utils-2.10.0" + (sources."gatsby-recipes-0.21.0" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.9.0" + sources."gatsby-telemetry-2.10.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -85591,7 +85705,7 @@ in sources."inherits-2.0.3" ]; }) - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-2.1.0" @@ -85754,7 +85868,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -85884,7 +85998,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.0" + sources."strtok3-6.1.3" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -85894,7 +86008,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -86249,7 +86363,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86606,7 +86720,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86700,7 +86814,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -87215,7 +87329,7 @@ in sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."picomatch-2.3.0" - sources."rechoir-0.7.0" + sources."rechoir-0.7.1" sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."to-regex-range-5.0.1" @@ -89387,9 +89501,9 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.0" - sources."@ot-builder/bin-composite-types-1.0.11" - sources."@ot-builder/bin-util-1.0.11" - (sources."@ot-builder/cli-help-shower-1.0.11" // { + sources."@ot-builder/bin-composite-types-1.1.0" + sources."@ot-builder/bin-util-1.1.0" + (sources."@ot-builder/cli-help-shower-1.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -89399,37 +89513,37 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/cli-proc-1.0.11" - sources."@ot-builder/cli-shared-1.0.11" - sources."@ot-builder/common-impl-1.0.11" - sources."@ot-builder/errors-1.0.11" - sources."@ot-builder/io-bin-cff-1.0.11" - sources."@ot-builder/io-bin-encoding-1.0.11" - sources."@ot-builder/io-bin-ext-private-1.0.11" - sources."@ot-builder/io-bin-font-1.0.11" - sources."@ot-builder/io-bin-glyph-store-1.0.11" - sources."@ot-builder/io-bin-layout-1.0.11" - sources."@ot-builder/io-bin-metadata-1.0.11" - sources."@ot-builder/io-bin-metric-1.0.11" - sources."@ot-builder/io-bin-name-1.0.11" - sources."@ot-builder/io-bin-sfnt-1.0.11" - sources."@ot-builder/io-bin-ttf-1.0.11" - sources."@ot-builder/ot-1.0.11" - sources."@ot-builder/ot-encoding-1.0.11" - sources."@ot-builder/ot-ext-private-1.0.11" - sources."@ot-builder/ot-glyphs-1.0.11" - sources."@ot-builder/ot-layout-1.0.11" - sources."@ot-builder/ot-metadata-1.0.11" - sources."@ot-builder/ot-name-1.0.11" - sources."@ot-builder/ot-sfnt-1.0.11" - sources."@ot-builder/ot-standard-glyph-namer-1.0.11" - sources."@ot-builder/prelude-1.0.11" - sources."@ot-builder/primitive-1.0.11" - sources."@ot-builder/rectify-1.0.11" - sources."@ot-builder/stat-glyphs-1.0.11" - sources."@ot-builder/trace-1.0.11" - sources."@ot-builder/var-store-1.0.11" - sources."@ot-builder/variance-1.0.11" + sources."@ot-builder/cli-proc-1.1.0" + sources."@ot-builder/cli-shared-1.1.0" + sources."@ot-builder/common-impl-1.1.0" + sources."@ot-builder/errors-1.1.0" + sources."@ot-builder/io-bin-cff-1.1.0" + sources."@ot-builder/io-bin-encoding-1.1.0" + sources."@ot-builder/io-bin-ext-private-1.1.0" + sources."@ot-builder/io-bin-font-1.1.0" + sources."@ot-builder/io-bin-glyph-store-1.1.0" + sources."@ot-builder/io-bin-layout-1.1.0" + sources."@ot-builder/io-bin-metadata-1.1.0" + sources."@ot-builder/io-bin-metric-1.1.0" + sources."@ot-builder/io-bin-name-1.1.0" + sources."@ot-builder/io-bin-sfnt-1.1.0" + sources."@ot-builder/io-bin-ttf-1.1.0" + sources."@ot-builder/ot-1.1.0" + sources."@ot-builder/ot-encoding-1.1.0" + sources."@ot-builder/ot-ext-private-1.1.0" + sources."@ot-builder/ot-glyphs-1.1.0" + sources."@ot-builder/ot-layout-1.1.0" + sources."@ot-builder/ot-metadata-1.1.0" + sources."@ot-builder/ot-name-1.1.0" + sources."@ot-builder/ot-sfnt-1.1.0" + sources."@ot-builder/ot-standard-glyph-namer-1.1.0" + sources."@ot-builder/prelude-1.1.0" + sources."@ot-builder/primitive-1.1.0" + sources."@ot-builder/rectify-1.1.0" + sources."@ot-builder/stat-glyphs-1.1.0" + sources."@ot-builder/trace-1.1.0" + sources."@ot-builder/var-store-1.1.0" + sources."@ot-builder/variance-1.1.0" sources."@unicode/unicode-13.0.0-1.1.0" sources."aglfn-1.0.2" sources."amdefine-1.0.1" @@ -89511,8 +89625,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.11" - sources."otb-ttc-bundle-1.0.11" + sources."ot-builder-1.1.0" + sources."otb-ttc-bundle-1.1.0" sources."passerror-1.1.1" sources."patel-0.34.0" sources."path-is-absolute-1.0.1" @@ -89786,7 +89900,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90073,7 +90187,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."katex-0.13.11" + sources."katex-0.13.13" sources."keytar-7.7.0" sources."khroma-1.4.1" sources."klaw-1.3.1" @@ -90272,9 +90386,7 @@ in sources."seventh-0.7.40" (sources."sharp-0.26.3" // { dependencies = [ - sources."color-3.2.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.2.1" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" @@ -90505,7 +90617,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -91782,10 +91894,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.13.11"; + version = "0.13.13"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz"; - sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz"; + sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; }; dependencies = [ sources."commander-6.2.1" @@ -91812,7 +91924,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92834,7 +92946,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -92956,19 +93068,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.1.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.5.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.7.0" + sources."@octokit/types-6.21.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -94499,12 +94611,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -94513,24 +94625,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" @@ -94597,13 +94709,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -94624,7 +94736,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94797,7 +94909,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -94921,7 +95033,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96169,7 +96281,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -96827,20 +96939,20 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.4.2"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.2.tgz"; - sha512 = "VR0FrWp5wRUxTSTq/RDv6Lybhi/KL8UCf1pQN6xyUDBamysfPneunOB/TNa29cazM+AXslVYxe8VnDJxMjBaiA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.0.tgz"; + sha512 = "Jwy74SaN5rM4xTE2QSZijF0qN1a/ZGh1PJWUmzmVFX1RnEgA1QMZ7MVHW04UXxZ3igx+G03GGzC071+FRLKT6g=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -96848,7 +96960,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -96861,18 +96973,18 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -96882,7 +96994,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -96945,16 +97057,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@bugsnag/browser-7.10.5" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" @@ -96964,7 +97076,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.5" // { + (sources."@netlify/build-16.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -96986,7 +97098,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-12.6.0" // { + (sources."@netlify/config-13.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -97015,14 +97127,27 @@ in sources."to-regex-range-5.0.1" ]; }) + sources."@netlify/local-functions-proxy-0.1.0" + sources."@netlify/local-functions-proxy-darwin-arm64-0.1.0" + sources."@netlify/local-functions-proxy-darwin-x64-0.1.0" + sources."@netlify/local-functions-proxy-freebsd-arm64-0.1.0" + sources."@netlify/local-functions-proxy-freebsd-x64-0.1.0" + sources."@netlify/local-functions-proxy-linux-arm-0.1.0" + sources."@netlify/local-functions-proxy-linux-arm64-0.1.0" + sources."@netlify/local-functions-proxy-linux-ia32-0.1.0" + sources."@netlify/local-functions-proxy-linux-ppc64-0.1.0" + sources."@netlify/local-functions-proxy-linux-x64-0.1.0" + sources."@netlify/local-functions-proxy-openbsd-x64-0.1.0" + sources."@netlify/local-functions-proxy-win32-ia32-0.1.0" + sources."@netlify/local-functions-proxy-win32-x64-0.1.0" sources."@netlify/open-api-2.5.0" - (sources."@netlify/plugin-edge-handlers-1.11.21" // { + (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.5" ]; }) sources."@netlify/plugins-list-2.19.3" - sources."@netlify/routing-local-proxy-0.30.2" + sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -97155,18 +97280,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.1.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.5.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.7.0" + sources."@octokit/types-6.21.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97203,7 +97328,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -97211,8 +97336,8 @@ in sources."@types/semver-7.3.7" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.3" - (sources."@typescript-eslint/typescript-estree-4.28.3" // { + sources."@typescript-eslint/types-4.28.4" + (sources."@typescript-eslint/typescript-estree-4.28.4" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -97229,7 +97354,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.3" + sources."@typescript-eslint/visitor-keys-4.28.4" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -97362,7 +97487,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -97628,7 +97753,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -98358,7 +98483,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.3.5" + sources."postcss-8.3.6" sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -98446,7 +98571,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -99326,20 +99451,20 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.3.5.tgz"; - sha512 = "P/EmWwzuY/0mQFlrklSUrVANdv9xQsbrpKrpfA8tuhhxu1OEiSgzYdo87Zj13Hi38K4f1rNPQj4rw2vEBcYS/g=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.1.tgz"; + sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" - sources."@node-red/editor-api-1.3.5" - sources."@node-red/editor-client-1.3.5" - (sources."@node-red/nodes-1.3.5" // { + sources."@babel/runtime-7.14.8" + sources."@mapbox/node-pre-gyp-1.0.5" + sources."@node-red/editor-api-2.0.1" + sources."@node-red/editor-client-2.0.1" + (sources."@node-red/nodes-2.0.1" // { dependencies = [ - sources."cookie-0.4.1" sources."http-errors-1.7.3" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."inherits-2.0.4" sources."media-typer-1.1.0" (sources."raw-body-2.4.1" // { @@ -99349,18 +99474,28 @@ in }) ]; }) - sources."@node-red/registry-1.3.5" - sources."@node-red/runtime-1.3.5" - sources."@node-red/util-1.3.5" + sources."@node-red/registry-2.0.1" + sources."@node-red/runtime-2.0.1" + sources."@node-red/util-2.0.1" + sources."@sindresorhus/is-4.0.1" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.2" + sources."@types/node-16.4.0" + sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" + sources."acorn-8.4.1" + sources."acorn-walk-8.1.1" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."ajv-6.12.6" + sources."ajv-8.6.0" + sources."ansi-colors-4.1.1" sources."ansi-regex-2.1.1" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -99374,14 +99509,9 @@ in }) sources."argparse-1.0.10" sources."array-flatten-1.1.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."async-0.1.22" - sources."async-limiter-1.0.1" sources."async-mutex-0.3.1" sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."axios-0.21.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -99390,21 +99520,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."bcrypt-3.0.6" // { - dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."nan-2.13.2" - sources."node-pre-gyp-0.12.0" - sources."nopt-4.0.3" - sources."semver-5.7.1" - sources."tar-4.4.13" - sources."yallist-3.1.1" - ]; - }) - sources."bcrypt-pbkdf-1.0.2" + sources."bcrypt-5.0.1" sources."bcryptjs-2.4.3" (sources."bl-4.1.0" // { dependencies = [ @@ -99420,12 +99536,14 @@ in sources."buffer-from-1.1.1" sources."busboy-0.2.14" sources."bytes-3.1.0" - sources."callback-stream-1.1.0" - sources."caseless-0.12.0" - sources."cheerio-0.22.0" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" sources."chownr-2.0.0" sources."cli-table-0.3.6" sources."clone-2.1.2" + sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."colors-1.0.3" sources."combined-stream-1.0.8" @@ -99446,17 +99564,25 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-parser-1.4.5" + sources."cookie-0.4.1" + (sources."cookie-parser-1.4.5" // { + dependencies = [ + sources."cookie-0.4.0" + ]; + }) sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-1.7.2" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."dashdash-1.14.1" + sources."cronosjs-1.7.1" + sources."css-select-4.1.3" + sources."css-what-5.0.1" sources."debug-2.6.9" - sources."deep-extend-0.6.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) + sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.0" @@ -99464,126 +99590,102 @@ in sources."destroy-1.0.4" sources."detect-libc-1.0.3" sources."dicer-0.2.5" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" - (sources."duplexify-3.7.1" // { + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.2.0" + sources."domutils-2.7.0" + (sources."duplexify-4.1.2" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) - sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-1.1.2" + sources."enquirer-2.3.6" + sources."entities-2.2.0" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.17.1" // { dependencies = [ + sources."cookie-0.4.0" sources."safe-buffer-5.1.2" ]; }) - (sources."express-session-1.17.1" // { + (sources."express-session-1.17.2" // { dependencies = [ sources."depd-2.0.0" ]; }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" sources."follow-redirects-1.14.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" + (sources."fs-extra-10.0.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."fs-minipass-2.1.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."getpass-0.1.7" + sources."get-stream-5.2.0" sources."glob-7.1.7" - sources."glob-parent-3.1.0" - (sources."glob-stream-6.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."got-11.8.2" sources."graceful-fs-4.2.6" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" - sources."help-me-1.1.0" - (sources."htmlparser2-3.10.1" // { + (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) + sources."hpagent-0.1.2" + sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" - sources."http-signature-1.2.0" + sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."i18next-15.1.2" + sources."i18next-20.3.2" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.8" sources."ipaddr.js-1.9.1" - sources."is-absolute-1.0.0" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-3.1.0" - sources."is-negated-glob-1.0.0" - sources."is-relative-1.0.0" - sources."is-typedarray-1.0.0" - sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.2" sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."js-yaml-3.14.0" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" + sources."js-yaml-3.14.1" + sources."json-buffer-3.0.1" + sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" sources."jsonata-1.8.4" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."keyv-4.0.3" sources."leven-2.1.0" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" + sources."lowercase-keys-2.0.0" sources."lru-cache-4.1.5" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."media-typer-0.3.0" (sources."memorystore-1.6.6" // { dependencies = [ @@ -99596,6 +99698,7 @@ in sources."mime-2.5.2" sources."mime-db-1.48.0" sources."mime-types-2.1.31" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-3.1.3" // { @@ -99611,14 +99714,13 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.33" - (sources."mqtt-4.2.6" // { + (sources."mqtt-4.2.8" // { dependencies = [ sources."concat-stream-2.0.0" sources."debug-4.3.2" sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.3" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -99631,99 +99733,60 @@ in sources."multer-1.4.2" sources."mustache-4.2.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" - (sources."needle-2.8.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) sources."negotiator-0.6.2" - (sources."node-pre-gyp-0.14.0" // { - dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."nopt-4.0.3" - sources."semver-5.7.1" - sources."tar-4.4.13" - sources."yallist-3.1.1" - ]; - }) - (sources."node-red-admin-0.2.7" // { - dependencies = [ - sources."bcrypt-3.0.8" - ]; - }) - sources."node-red-node-rbe-0.5.0" - sources."node-red-node-tail-0.3.1" + sources."node-addon-api-3.2.1" + sources."node-fetch-2.6.1" + sources."node-red-admin-2.2.0" sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" + sources."normalize-url-6.1.0" sources."npmlog-4.1.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - (sources."ordered-read-streams-1.0.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" + sources."p-cancelable-2.1.1" + sources."parse5-6.0.1" + sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" sources."passport-0.4.1" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" sources."passport-strategy-1.0.0" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" - sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."punycode-2.1.1" sources."qs-6.7.0" + sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."regenerator-runtime-0.13.8" sources."reinterval-1.1.0" - sources."remove-trailing-separator-1.1.0" - (sources."request-2.88.0" // { - dependencies = [ - sources."qs-6.5.2" - ]; - }) + sources."require-from-string-2.0.2" + sources."resolve-alpn-1.2.0" + sources."responselike-2.0.0" sources."retry-0.6.1" - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.0" + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-6.3.0" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."send-0.17.1" // { dependencies = [ sources."mime-1.6.0" @@ -99741,58 +99804,36 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."tail-2.2.3" (sources."tar-6.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" ]; }) - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."through2-filter-3.0.0" - sources."to-absolute-glob-2.0.2" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-4.0.0" sources."tslib-2.3.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.3" + sources."uglify-js-3.13.10" sources."uid-safe-2.1.5" sources."uid2-0.0.3" - sources."unc-path-regex-0.1.2" - sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-8.3.2" sources."vary-1.1.2" - sources."verror-1.10.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" @@ -100175,7 +100216,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -100201,7 +100242,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -101080,6 +101121,24 @@ in bypassCache = true; reconstructLock = true; }; + npm-merge-driver = nodeEnv.buildNodePackage { + name = "npm-merge-driver"; + packageName = "npm-merge-driver"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz"; + sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "git merge driver for automatically merging lockfiles"; + homepage = "https://github.com/npm/npm-merge-driver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; packageName = "npm2nix"; @@ -101306,14 +101365,14 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -101325,7 +101384,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -101338,20 +101397,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -101418,16 +101477,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -101549,7 +101608,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101560,12 +101619,7 @@ in sources."clone-2.1.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - (sources."color-3.2.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" @@ -101692,7 +101746,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103357,7 +103411,7 @@ in sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" @@ -103769,10 +103823,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.10.2"; + version = "6.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.2.tgz"; - sha512 = "o/CAEMtqjalEJyS9MgID3iZVx46LsqZ8MlwYGmWHNHD7Q0nOqtuYj+BKmgCXRiIWANA/JuC0Y6usNKhU8P3haw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.3.tgz"; + sha512 = "GdxerBN3hhe9x9W0mAMmiWoDELy7KekrmHbYdo7WeHC1MthP/gI7MGVYIgcKj9Vy4zWLO9v1hVYOgKUrewkDVg=="; }; buildInputs = globalBuildInputs; meta = { @@ -103815,10 +103869,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.3.5"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; - sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; dependencies = [ sources."colorette-1.2.2" @@ -104692,15 +104746,15 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.5" + sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -104708,7 +104762,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -104721,20 +104775,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -104809,7 +104863,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104818,16 +104872,16 @@ in sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -105015,7 +105069,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105069,12 +105123,7 @@ in sources."clone-response-1.0.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - (sources."color-3.2.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" @@ -105249,7 +105298,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106612,7 +106661,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -106623,20 +106672,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/runtime-7.14.6" + sources."@babel/parser-7.14.8" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.53" // { + (sources."@redocly/openapi-core-1.0.0-beta.54" // { dependencies = [ sources."@types/node-14.17.5" ]; @@ -106813,7 +106862,7 @@ in sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."pbkdf2-3.1.2" - sources."perfect-scrollbar-1.5.1" + sources."perfect-scrollbar-1.5.2" sources."picomatch-2.3.0" sources."polished-4.1.3" sources."postcss-value-parser-4.1.0" @@ -107119,10 +107168,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -107144,7 +107193,7 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -107178,13 +107227,13 @@ in sources."@types/node-fetch-2.5.11" sources."@types/resolve-1.17.1" sources."@types/vscode-1.58.1" - sources."@typescript-eslint/eslint-plugin-4.28.3" - sources."@typescript-eslint/experimental-utils-4.28.3" - sources."@typescript-eslint/parser-4.28.3" - sources."@typescript-eslint/scope-manager-4.28.3" - sources."@typescript-eslint/types-4.28.3" - sources."@typescript-eslint/typescript-estree-4.28.3" - sources."@typescript-eslint/visitor-keys-4.28.3" + sources."@typescript-eslint/eslint-plugin-4.28.4" + sources."@typescript-eslint/experimental-utils-4.28.4" + sources."@typescript-eslint/parser-4.28.4" + sources."@typescript-eslint/scope-manager-4.28.4" + sources."@typescript-eslint/types-4.28.4" + sources."@typescript-eslint/typescript-estree-4.28.4" + sources."@typescript-eslint/visitor-keys-4.28.4" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -107266,7 +107315,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.30.0" // { + (sources."eslint-7.31.0" // { dependencies = [ (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -107448,7 +107497,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -107862,7 +107911,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.13.4" // { + (sources."@serverless/components-3.14.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -107905,7 +107954,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.4.0" // { + (sources."@serverless/utils-5.6.0" // { dependencies = [ sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" @@ -107923,7 +107972,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -107984,7 +108033,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108166,7 +108215,7 @@ in sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."duration-0.2.2" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" @@ -108213,7 +108262,7 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -108459,7 +108508,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -108507,7 +108556,7 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.10.1" @@ -108570,7 +108619,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.0" + sources."strtok3-6.1.3" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -108631,7 +108680,7 @@ in sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -109339,10 +109388,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.662.0"; + version = "1.664.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.662.0.tgz"; - sha512 = "sVSFIZ5cxhKoe2Gr3KD3LHKuTlCzVgA0KPa/2NhwyHFVQoSmoVirqntUt4V3taiEOFAk+F++cQ9jAcx2Qlc8nA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.664.0.tgz"; + sha512 = "4YPqDdPPZsn3BBN82UiN6+Jy4zdKbBvw4MKClvh2QQgUJy6R9nEm/Q8IbdsM0jOqPByDRWVMwsCPQu3ZpqG3KA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -109409,7 +109458,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@snyk/snyk-docker-pull-3.6.2" // { + (sources."@snyk/snyk-docker-pull-3.6.3" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -109846,7 +109895,7 @@ in sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -109878,7 +109927,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."snyk-docker-plugin-4.21.3" // { + (sources."snyk-docker-plugin-4.22.1" // { dependencies = [ sources."argparse-2.0.1" sources."js-yaml-4.1.0" @@ -110100,7 +110149,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -111366,7 +111415,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -112150,31 +112199,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -112204,7 +112253,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -112242,7 +112291,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112484,7 +112533,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -112557,6 +112606,74 @@ in bypassCache = true; reconstructLock = true; }; + svelte-check = nodeEnv.buildNodePackage { + name = "svelte-check"; + packageName = "svelte-check"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.3.tgz"; + sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; + }; + dependencies = [ + sources."@types/node-16.4.0" + sources."@types/pug-2.0.5" + sources."@types/sass-1.16.1" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."callsites-3.1.0" + sources."chalk-4.1.1" + sources."chokidar-3.5.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."detect-indent-6.1.0" + sources."fill-range-7.0.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."has-flag-4.0.0" + sources."import-fresh-3.3.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mri-1.1.6" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."parent-module-1.0.1" + sources."path-is-absolute-1.0.1" + sources."picomatch-2.3.0" + sources."readdirp-3.6.0" + sources."resolve-from-4.0.0" + sources."sade-1.7.4" + sources."source-map-0.7.3" + sources."strip-indent-3.0.0" + sources."supports-color-7.2.0" + sources."svelte-preprocess-4.7.4" + sources."to-regex-range-5.0.1" + sources."typescript-4.3.5" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Svelte Code Checker Terminal Interface"; + homepage = "https://github.com/sveltejs/language-tools#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; @@ -113832,7 +113949,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -114642,7 +114759,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -114970,7 +115087,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" @@ -115027,7 +115144,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.0" + sources."strtok3-6.2.2" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -116180,7 +116297,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -116224,7 +116341,11 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.31.0" - sources."eslint-plugin-vue-7.13.0" + (sources."eslint-plugin-vue-7.14.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -116340,7 +116461,7 @@ in sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.8.0" // { + (sources."vue-eslint-parser-7.9.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -116576,7 +116697,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -116616,7 +116737,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116756,13 +116877,13 @@ in sources."read-1.0.7" sources."readable-stream-1.0.34" sources."readdirp-3.5.0" - sources."rechoir-0.7.0" + sources."rechoir-0.7.1" sources."require-directory-2.1.1" sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."semver-5.7.1" sources."serialize-javascript-5.0.1" sources."shallow-clone-3.0.1" @@ -116833,7 +116954,7 @@ in ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-2.3.0" + sources."webpack-sources-2.3.1" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -117166,7 +117287,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -117183,7 +117304,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -117383,7 +117504,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - (sources."vue-eslint-parser-7.8.0" // { + (sources."vue-eslint-parser-7.9.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -118106,7 +118227,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.7" + sources."@babel/runtime-corejs3-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -118329,7 +118450,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -118355,7 +118476,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118655,7 +118776,7 @@ in sources."lcid-3.1.1" sources."levn-0.4.1" sources."lie-3.3.0" - sources."lighthouse-logger-1.2.0" + sources."lighthouse-logger-1.3.0" sources."lines-and-columns-1.1.6" sources."lodash.clonedeep-4.5.0" sources."lodash.includes-4.3.0" @@ -118918,7 +119039,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -118941,11 +119062,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.782" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -118975,7 +119096,7 @@ in sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" @@ -118990,7 +119111,7 @@ in sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-2.3.0" + sources."webpack-sources-2.3.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -119048,7 +119169,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."pkg-dir-4.2.0" - sources."rechoir-0.7.0" + sources."rechoir-0.7.1" sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" @@ -119083,7 +119204,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119680,7 +119801,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" sources."fill-range-7.0.1" - sources."glob-parent-6.0.0" + sources."glob-parent-6.0.1" sources."globby-11.0.4" sources."ignore-5.1.8" sources."is-extglob-2.1.1" @@ -119699,7 +119820,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" sources."slash-3.0.0" sources."to-regex-range-5.0.1" @@ -119719,10 +119840,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.2.tgz"; - sha512 = "czMFGRzxT2IsgZoMkmHwGASBSx/pLGQOZV3oAD/c5qCw4+YVBMYP2/FehaQ/CF3dMKBnIH4jIevK2KT6pdRC2A=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.3.tgz"; + sha512 = "Av+6PnflFJueTj19z6Pv/ai9KzOV8r7nClBiQCBbO55eqNL6pNBV47N/KwxDIPx8OeATTFEA/joCohi5AD/8TQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -119737,7 +119858,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -120027,7 +120148,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.2.4" // { + (sources."webtorrent-1.2.5" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -120173,7 +120294,7 @@ in sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -121111,7 +121232,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix deleted file mode 100644 index f762e9c7b23..00000000000 --- a/pkgs/development/ocaml-modules/http/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "ocaml-http is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation { - name = "ocaml-http-0.1.5"; - - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz"; - sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; - }; - - buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocaml_pcre ocamlnet]; - - createFindlibDestdir = true; - - prePatch = '' - BASH=$(type -tp bash) - echo $BASH - substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - ''; - - dontConfigure = true; # Skip configure phase - - buildPhase = '' - make all opt - ''; - - meta = with lib; { - homepage = "http://ocaml-http.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; - description = "Do it yourself (OCaml) HTTP daemon"; - license = licenses.lgpl2; - maintainers = with maintainers; [ roconnor vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 41fdbc4eedc..8aaf1bcbddb 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.8"; + version = "0.5.9"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk"; + sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2"; }; postConfigure = '' diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 7051c51cc5c..c8035eea42d 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchurl, buildDunePackage, opaline, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , alcotest , astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp , pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.8.1"; + version = "1.10.1"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv"; + sha256 = "10d4sfv4qk9569kj46pcaw6cih40v6bkgd44lmsp7cyfhvl8pa9x"; }; nativeBuildInputs = [ cppo ]; @@ -23,7 +23,9 @@ buildDunePackage rec { outputs = [ "bin" "lib" "out" ]; installPhase = '' - ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib + runHook preInstall + dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib ${pname} + runHook postInstall ''; meta = { diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index b501282c155..6e172dee6ee 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -1,4 +1,5 @@ { buildDunePackage +, cppo , stdlib-shims , ppx_yojson_conv_lib , ocaml-syntax-shims @@ -26,16 +27,20 @@ buildDunePackage { ''; buildInputs = [ - stdlib-shims + cppo ppx_yojson_conv_lib ocaml-syntax-shims octavius - uutf - csexp dune-build-info omd cmdliner + ]; + + propagatedBuildInputs = [ + csexp jsonrpc + stdlib-shims + uutf ]; meta = jsonrpc.meta // { diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix index 69fa4cba851..9a6dd1f7cb6 100644 --- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, buildDunePackage -, ocaml-migrate-parsetree, ppx_tools_versioned +, ppxlib }: buildDunePackage rec { pname = "ocaml-monadic"; - version = "0.4.1"; + version = "0.5.0"; useDune2 = true; @@ -12,11 +12,10 @@ buildDunePackage rec { owner = "zepalmer"; repo = pname; rev = version; - sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll"; + sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw"; }; - buildInputs = [ ppx_tools_versioned ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ]; + buildInputs = [ ppxlib ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index fad5917a5a4..68c06cc4c6f 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "odoc"; - version = "1.5.2"; + version = "1.5.3"; minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; - sha256 = "0wa87h8q6izcc6rkzqn944vrb3hmc21lf0d0rmr8rhhbcvr66i6j"; + sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 210b7d58857..ea853c4648b 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }: +{ lib, buildDunePackage, fetchurl, pcre, dune-configurator }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-pcre-${version}"; - version = "7.2.3"; +buildDunePackage rec { + pname = "pcre"; + version = "7.4.6"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz"; - sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz"; + sha256 = "17ajl0ra5xkxn5pf0m0zalylp44wsfy6mvcq213djh2pwznh4gya"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [pcre]; - - createFindlibDestdir = true; + buildInputs = [ dune-configurator ]; - dontConfigure = true; # Skip configure phase + propagatedBuildInputs = [ pcre ]; meta = with lib; { - homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; + homepage = "https://mmottl.github.io/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ maggesi vbmithr ]; }; } diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 07025be296c..2be9ce1b021 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,48 +1,22 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, dune_2, cppo, easy-format, biniou }: -let - pname = "yojson"; - param = - if lib.versionAtLeast ocaml.version "4.02" then rec { - version = "1.7.0"; - url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; - nativeBuildInputs = [ dune_2 ]; - extra = { - installPhase = '' - dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} - ''; - }; - } else rec { - version = "1.2.3"; - url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz"; - sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; - extra = { - createFindlibDestdir = true; +{ lib, fetchurl, buildDunePackage, cppo, easy-format, biniou }: - makeFlags = [ "PREFIX=$(out)" ]; - - preBuild = "mkdir $out/bin"; - }; - }; -in -stdenv.mkDerivation ({ - - name = "ocaml${ocaml.version}-${pname}-${param.version}"; +buildDunePackage rec { + pname = "yojson"; + version = "1.7.0"; + useDune2 = true; - src = fetchzip { - inherit (param) url sha256; + src = fetchurl { + url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; + sha256 = "1iich6323npvvs8r50lkr4pxxqm9mf6w67cnid7jg1j1g5gwcvv5"; }; - nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []); - propagatedNativeBuildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ easy-format biniou ]; - configurePlatforms = []; meta = with lib; { description = "An optimized parsing and printing library for the JSON format"; homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; }; -} // param.extra) +} diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 1a27c8c1f0f..a4083707a07 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pytest-asyncio , pytest-tornado -, pytestcov +, pytest-cov , sqlalchemy , tornado , twisted @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest-asyncio pytest-tornado pytestCheckHook - pytestcov + pytest-cov sqlalchemy tornado twisted diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 22e4a67ff2a..47a70940e92 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.4"; + version = "0.4.0"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-H1GVbMeaVUZh8T1jgZP2o+emEkK4fOi5k4aL9ayVesA="; + sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix new file mode 100644 index 00000000000..2bb531cff90 --- /dev/null +++ b/pkgs/development/python-modules/addict/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "addict"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "addict" ]; + + meta = with lib; { + description = "Module that exposes a dictionary subclass that allows items to be set like attributes"; + homepage = "https://github.com/mewwts/addict"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 890f44b4ad3..68f166b3c7c 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate sqlalchemy ]; + # crate is broken in nixpkgs, with SQLAlchemy > 1.3 + # Skip tests for now as they rely on it. + doCheck = false; + checkInputs = [ crate nose geojson ]; checkPhase = '' diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index a6c99e72c0a..3ddd3d366e8 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk="; + sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz"; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 728f2b5fa61..dc70baab9e5 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , contextvars @@ -23,7 +23,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 896b9c71a70..5def5b1d13f 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,22 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, protobuf +, zeroconf +}: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.9.0"; + version = "4.1.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "11259cd1f115d31b91512a209779fa813dded747408100805bc8ecf7c1c1fa82"; + sha256 = "0210l2d5g76pllr2vh990k9shfv3zrknx5d2dmgqb5y90142cp76"; }; - propagatedBuildInputs = [ attrs protobuf zeroconf ]; + propagatedBuildInputs = [ + protobuf + zeroconf + ]; # no tests implemented doCheck = false; - pythonImportsCheck = [ "aioesphomeapi" ]; + pythonImportsCheck = [ + "aioesphomeapi" + ]; meta = with lib; { description = "Python Client for ESPHome native API"; diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index e3ca13859ac..a610dba7661 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -4,7 +4,7 @@ , isPy27 , pytest , pytest-asyncio -, pytestcov +, pytest-cov , trustme , async-timeout }: @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-asyncio - pytestcov + pytest-cov trustme async-timeout ]; diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 74ff8fb3fde..71e1fb43dd5 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8="; + sha256 = "0nqsacg0yrsqr6qax4486ffk8r88ra5yixxd6r88jwscm2bmjg3p"; }; format = "pyproject"; @@ -45,15 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/bachya/aioguardian/pull/66 - substituteInPlace pyproject.toml \ - --replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"' - # https://github.com/bachya/aioguardian/pull/67 - substituteInPlace pyproject.toml \ - --replace "poetry>=0.12" "poetry-core" - ''; - disabledTestPaths = [ "examples/" ]; pythonImportsCheck = [ "aioguardian" ]; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index f1c018989c2..981a541e9ec 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.3.0"; + version = "0.4.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-chRUQyCDXW4of0XBdmKuQEzUE3Gt4A2uGlPNy+oEoco="; + sha256 = "12v9szalh3yzfqgmspk4ch8l38kzmhwzjn9jvsq632n4zhjd7qg4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 0a939dfb009..589aa14509e 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: buildPythonPackage rec { pname = "aiohttp-jinja2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp jinja2 ]; - checkInputs = [ pytest pytest-aiohttp pytestcov ]; + checkInputs = [ pytest pytest-aiohttp pytest-cov ]; checkPhase = '' pytest -W ignore::DeprecationWarning diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 8a8f7c4b313..f3abbddfd95 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch, buildPythonPackage, fetchPypi -, aiohttp, pytest, pytestcov, pytest-aiohttp +, aiohttp, pytest, pytest-cov, pytest-aiohttp }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytest pytestcov pytest-aiohttp ]; + checkInputs = [ pytest pytest-cov pytest-aiohttp ]; checkPhase = '' python -m pytest ''; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 0bdab3bb283..e15271bafdb 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, pytestcov +, pytest-cov , pytest-asyncio }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"; }; - checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 81502a470a6..9c7244b3c06 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, coverage, setuptools +, pytest, pytest-cov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, python-dateutil }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; }; - buildInputs = [ pytest pytestcov mock coverage ]; + buildInputs = [ pytest pytest-cov mock coverage ]; propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 285a125a725..acad9cb0f59 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw="; + sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index e5ab1954276..1ab86c1820a 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY="; + sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 0a5cc01d929..0c88c378516 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.11"; + version = "2.10.12"; src = fetchPypi { inherit pname version; - sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw"; + sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4dd606c9adb..8584ba7166a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.1.0"; - sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm"; + version = "4.2.0"; + sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.2"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s"; + sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 12eed6bdb29..95b127a0db3 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchPypi , buildPythonPackage , pycrypto , paramiko @@ -18,13 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.23"; + version = "2.9.24"; - src = fetchFromGitHub { - owner = "ansible"; - repo = "ansible"; - rev = "v${version}"; - sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o="; }; prePatch = '' diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index cc990617157..dea5776fb61 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ }: let - version = "2.1.1rc1"; + version = "2.1.2"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "1vzzmcfgqni9rkf7ggh8mswnm3ffwaishcz1ysrwx0a96ilhm9q2"; + sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 61cfed3dbb9..04a3e11be3e 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp +, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp + pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 60c3e8905b5..40583a12ada 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9031"; + version = "9.0.9166"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E="; + sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 6c62fd104f2..cf2f9255720 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,7 +3,7 @@ , importlib-metadata , pexpect , prettytable -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { pname = "argcomplete"; @@ -24,7 +24,7 @@ buildPythonPackage rec { importlib-metadata pexpect prettytable - requests_toolbelt + requests-toolbelt ]; pythonImportsCheck = [ "argcomplete" ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 9ea4fdf64b5..2a7e6cb0df9 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytestcov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 97718a30069..5ad433413ce 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix index d87f1ede3cc..88864ec78b7 100644 --- a/pkgs/development/python-modules/arrow/2.nix +++ b/pkgs/development/python-modules/arrow/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache -, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ dateparser pytestCheckHook - pytestcov + pytest-cov pytest-mock pytz simplejson diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 522f406da42..d8a378b082f 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "asyncio_mqtt"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0550229cecde6ff1751c49dd5ea26b02bf52b7e9bbe9bf763da765f35bb281de"; + sha256 = "0s94dvgh1fazycppki5m6f9d60hc4ykhqfznlzpwl4dzknxplpsz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 5f00955eef9..4d96bcbe26b 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,6 +1,6 @@ { lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage , pytest -, pytestcov +, pytest-cov , sybil , typing-extensions }: @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest pytestcov sybil + pytest pytest-cov sybil ]; checkPhase = '' diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix index 3783f9776cd..ce9f1eabc77 100644 --- a/pkgs/development/python-modules/awkward0/default.nix +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , numpy -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 586176300b7..cb5665363f9 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -6,7 +6,7 @@ , pytest , pytest-black , pytest-flake8 -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; # ironically, they fail a linting test, and pytest.ini forces that test suite checkPhase = '' rm backports/functools_lru_cache.py diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index e07b02a08e7..8a1e6771b11 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchFromGitHub -, wheel, pytestCheckHook, pytestrunner, pythonAtLeast }: +, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }: buildPythonPackage rec { version = "0.18.4"; @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests - checkInputs = [ pytestCheckHook pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-runner ]; dontUseSetuptoolsCheck = true; disabledTests = [ # Test fails with a an error: AssertionError: assert 30 == 31 diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 7df23d1a25a..7d8e6ff5bee 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "00sa4x1qzv861z9d83lk4lp1g2pqiv9hpawj92w4qn1wnqxbz6rw"; + sha256 = "1836wm8whbryp31zdaj3b6w40sx1wjsxgpjdb1x9rgmwff4d1hc0"; }; prePatch = '' diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 459d3c51d7e..087329d103e 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, betamax, requests_toolbelt }: +, betamax, requests-toolbelt }: buildPythonPackage rec { pname = "betamax-matchers"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; }; - buildInputs = [ betamax requests_toolbelt ]; + buildInputs = [ betamax requests-toolbelt ]; meta = with lib; { homepage = "https://github.com/sigmavirus24/betamax_matchers"; diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 53319466d3a..d68318355d8 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestrunner +, pytest-runner , six , html5lib , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix index bd7bde42901..84c1767bc29 100644 --- a/pkgs/development/python-modules/cairocffi/0_9.nix +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 5c561af2f17..9b64dbeb66c 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index 8b674f3baaa..cdcdbad3395 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ numpy pytest pytestrunner glibcLocales ]; + checkInputs = [ numpy pytest pytest-runner glibcLocales ]; propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; checkPhase = '' diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 0e8732f69a8..2495040887f 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook }: buildPythonPackage rec { pname = "capturer"; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7c324e646a4..61ec6c2125f 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , python, runCommand , fetchFromGitHub -, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface +, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, python-dateutil +, pytest-xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; propagatedBuildInputs = [ - ConfigArgParse + configargparse acme configobj cryptography @@ -42,7 +42,7 @@ buildPythonPackage rec { checkInputs = [ python-dateutil pytestCheckHook - pytest_xdist + pytest-xdist ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index da04ecf6889..bf3eab19d4f 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -5,8 +5,8 @@ # pythonPackages , click , pytest -, pytestcov -, pytestrunner +, pytest-cov +, pytest-runner , pyyaml , six }: @@ -30,8 +30,8 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov - pytestrunner + pytest-cov + pytest-runner ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index bec5f03cd88..46fad656cab 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pytestCheckHook , coveralls -, pytestcov +, pytest-cov , cython , numpy , python @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook coveralls - pytestcov + pytest-cov ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix index 65381d40268..5f6fe0a672a 100644 --- a/pkgs/development/python-modules/chardet/2.nix +++ b/pkgs/development/python-modules/chardet/2.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytestrunner, hypothesis }: +, pytest, pytest-runner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest pytest-runner hypothesis ]; meta = with lib; { homepage = "https://github.com/chardet/chardet"; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 50f6d33791d..6e9256ffacf 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -9,7 +9,7 @@ , portend , pyopenssl , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -46,7 +46,7 @@ buildPythonPackage rec { portend pyopenssl pytestCheckHook - pytestcov + pytest-cov pytest-mock requests requests-toolbelt diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index df50219fb17..2ae180a8bae 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 0b574e9114c..0c6f83ea71d 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix index 30220b48b72..61e1760f372 100644 --- a/pkgs/development/python-modules/ci-py/default.nix +++ b/pkgs/development/python-modules/ci-py/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pytest, pytestrunner, pytestCheckHook }: +, pytest, pytest-runner, pytestCheckHook }: buildPythonPackage rec { version = "1.0.0"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7"; }; - nativeBuildInputs = [ pytestrunner ]; # pytest-runner included in setup-requires + nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires checkInputs = [ pytest pytestCheckHook ]; pythonImportsCheck = [ "ci" ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 2c25d258e57..3dc930473f5 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg="; + sha256 = "0rwl5q7z16agcykn0an2lyqfn2z5yvmg0xcvxfpvndf6zpnbqhx0"; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index d6731260937..0110625eba8 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9031"; + version = "9.0.9166"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0="; + sha256 = "1mvdcwzim52mc7vjrr2cq8xwwi0v0ai3z608mg5nfbbf4zjji76c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index d829f43dc0d..8aeb73bb25b 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "clickclick"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; }; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index b2a13cdbb65..de42f728411 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPyPy -, pytest, pytestcov, pytest-mock, freezegun +, pytest, pytest-cov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc="; }; - checkInputs = [ pytest pytestcov pytest-mock freezegun ]; + checkInputs = [ pytest pytest-cov pytest-mock freezegun ]; propagatedBuildInputs = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 5d5b07ffd05..10966758218 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -4,7 +4,7 @@ , isPy27 , mock , pytest -, pytestrunner +, pytest-runner , sh , coverage , docopt @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; postPatch = '' diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 07b9652e775..c4a698c5250 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -39,5 +39,11 @@ buildPythonPackage rec { description = "A Python client library for CrateDB"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # 2021-07-12 (@layus): Please unbreak when an update fixes compatibility + # with the version of SQLAlchemy in nixpkgs + # And also re-enable tests in pythonPackages.agate-sql. + # The version string below is intentionally split, so nixpkgs-update does + # not change it. That would make this warning pretty useless. + broken = assert version == "0.2"+"6.0"; true; }; } diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index eadc3eb32b1..25bb35eab2d 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -4,8 +4,8 @@ , fetchPypi , tinycss2 , pytest -, pytestrunner -, pytestcov +, pytest-runner +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix new file mode 100644 index 00000000000..67b1722be51 --- /dev/null +++ b/pkgs/development/python-modules/dacite/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dacite"; + version = "1.6.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "konradhalas"; + repo = pname; + rev = "v${version}"; + sha256 = "0nv2bnj3bq2v08ac4p583cnpjq2d6bv5isycgji5i5wg1y082a3d"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dacite" ]; + + meta = with lib; { + description = "Python helper to create data classes from dictionaries"; + homepage = "https://github.com/konradhalas/dacite"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index f6d7fcac62a..90b108e3bc7 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub -, asgiref, autobahn, twisted, pytestrunner +, asgiref, autobahn, twisted, pytest-runner , hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ]; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 58920b40646..5a611c989f4 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.57.1"; + version = "0.58.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-BHsf3GOganPhsDiZlRxvAsRZH/Sq+Jr+CZcc2ubce+8="; + sha256 = "sha256-dtKqp7LV1fRjwOMAlmmAnC19j8hLA1oixGextATW6z0="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index d7cf79f9d07..ba27b633fef 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python -, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +, dbus, dbus-python, pytest, pytest-cov, pytest-asyncio, pytest-timeout }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { dbus dbus-python pytest - pytestcov + pytest-cov pytest-asyncio pytest-timeout ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index da1f25ad2c3..28368270884 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -8,7 +8,7 @@ , flask , psutil , pytest-timeout -, pytest_xdist +, pytest-xdist , pytestCheckHook , requests , isPy27 @@ -75,7 +75,7 @@ buildPythonPackage rec { flask psutil pytest-timeout - pytest_xdist + pytest-xdist pytestCheckHook requests ] ++ lib.optionals (!isPy27) [ diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 100c7ee6fc1..30853aa41a6 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , fonttools, setuptools-scm -, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestrunner + pytest-runner lxml fs unicodedata2 diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix new file mode 100644 index 00000000000..32050acfdf2 --- /dev/null +++ b/pkgs/development/python-modules/devtools/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, pythonOlder, fetchFromGitHub, lib, pygments +, pytestCheckHook, pytest-mock }: + +buildPythonPackage rec { + pname = "devtools"; + version = "0.6.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0s1d2jwijini7y1a3318yhb98mh1mw4pzlfx2zck3a8nqw984ki3"; + }; + + propagatedBuildInputs = [ pygments ]; + + checkInputs = [ pytestCheckHook pytest-mock ]; + + pythonImportsCheck = [ "devtools" ]; + + meta = with lib; { + description = "Python's missing debug print command and other development tools"; + homepage = "https://python-devtools.helpmanual.io/"; + license = licenses.mit; + maintainers = with maintainers; [ jdahm ]; + }; +} diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 8e35eabfb0d..d519aa76c8b 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner +, pytest-runner , setuptools , coverage, pytest }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index ed6007f87ed..0264c0ff10c 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -3,8 +3,8 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytestcov -, pytest_xdist +, pytest-cov +, pytest-xdist , pytest-django , mock }: @@ -22,8 +22,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov - pytest_xdist + pytest-cov + pytest-xdist pytest-django mock ]; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 8ee903bedc2..cbe5dfbaa70 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -5,7 +5,7 @@ , mock , pygments , pytest -, pytestcov +, pytest-cov , pytest-django , python-dateutil , shortuuid @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pygments # not explicitly declared in setup.py, but some tests require it pytest - pytestcov + pytest-cov pytest-django python-dateutil shortuuid diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 0e3eaff6cb5..9685e55bb1c 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , django_environ, mock, django -, pytest, pytestrunner, pytest-django +, pytest, pytest-runner, pytest-django }: buildPythonPackage rec { pname = "django-guardian"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0"; }; - checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; + checkInputs = [ pytest pytest-runner pytest-django django_environ mock ]; propagatedBuildInputs = [ django ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 7afe92b4337..e9a31b461fd 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }: buildPythonPackage rec { version = "1.2.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestcov pytest ]; + checkInputs = [ pytest-cov pytest ]; meta = with lib; { description = "Python library for parsing Dockerfile files"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 6e14355c293..05eb173c559 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , pytest -, pytestcov +, pytest-cov , mock , Mako , decorator @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest ''; - checkInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytest-cov mock Mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index c6751eede2f..f5a9274a0d1 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner, requests, urllib3, mock, setuptools, stone }: +, pytest-runner, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index a9af41c499d..eacaa00f152 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.20.23"; + version = "0.20.24"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QC5WtcB/BAR50RiOXC9AbiwAaqOUMIAVXUxtBeX8qGU="; + sha256 = "1wacchqxxwbhwnfnnhlb40s66f92lkvz6423j4c1w6wb585aqqbb"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 7cddb324f3a..8db7f6c9169 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock -, pytest_xdist, covCore, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock +, pytest-xdist, covCore, glibcLocales }: buildPythonPackage rec { pname = "dyn"; @@ -14,9 +14,9 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock - pytest_xdist + pytest-xdist covCore ]; # Disable checks because they are not stateless and require internet access. diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 11b13d8325a..c55bf52a664 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -5,7 +5,7 @@ , net-snmp , openssl , pytest -, pytestcov +, pytest-cov , pytest-flake8 , pytest-sugar , termcolor @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-flake8 pytest-sugar termcolor diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix new file mode 100644 index 00000000000..8f58720bd26 --- /dev/null +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, blessed +, prefixed +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "enlighten"; + version = "1.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984"; + }; + + propagatedBuildInputs = [ + blessed + prefixed + ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "enlighten" ]; + disabledTests = + # https://github.com/Rockhopper-Technologies/enlighten/issues/44 + lib.optional stdenv.isDarwin "test_autorefresh" + ; + + meta = with lib; { + description = "Enlighten Progress Bar for Python Console Apps"; + homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 3beb01e3b13..22894ab9f2a 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "0y4yjzmg6ns7a13j1cxqvrff4fd6k97cpc1xjwqrwp7gq49rzhy7"; + sha256 = "0v1wmjvi05i6mjh6yxqigbf2spf7842198yp98f7h0nyfjmz96hn"; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { "test_get_latest_frame" "test_get_loop" "test_get_ec_sites" + "test_ecradar" ]; pythonImportsCheck = [ "env_canada" ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index b804d4943b2..3b14560eb9d 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.65.2"; + version = "0.67.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "032srvbfdy02m1b664x67lkdcx6b2bd4c9a9cb176lscjk213240"; + sha256 = "15zbalyib7ndcbxvf9prj0n9n6qb4bfzhmaacsjrvdmjzmqdjgw0"; }; postPatch = '' @@ -51,7 +51,11 @@ buildPythonPackage rec { ]; # disabled tests require orjson which requires rust nightly - pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" ]; + + # ignoring deprecation warnings to avoid test failure from + # tests/test_tutorial/test_testing/test_tutorial001.py + + pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"]; disabledTests = [ "test_get_custom_response" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index eaf1a78520a..45d9976896e 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }: buildPythonPackage { pname = "fastpair"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c0694a58cb7..155f3b6e829 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pandas -, pytestrunner +, pytest-runner , cramjam , fsspec , thrift @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 5af3be420b0..1a3917fbdb7 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock, - pytestrunner }: + pytest-runner }: buildPythonPackage rec { pname = "favicon"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest requests-mock ]; propagatedBuildInputs = [ requests beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index f845ca6a5d3..1f8c6983cbd 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , ffmpeg , future -, pytestrunner +, pytest-runner , pytest-mock }: @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future ]; checkInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index b6f287669c5..0110db18c4c 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, mock, pytest, pytestrunner +, mock, pytest, pytest-runner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"; }; - checkInputs = [ pytest mock pytestrunner ]; + checkInputs = [ pytest mock pytest-runner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ] diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 708c5c351ea..9fd80ac6d67 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytestcov, pytest-xprocess, pytestcache }: +{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ pytestCheckHook pytestcov pytest-xprocess pytestcache ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-xprocess pytestcache ]; disabledTests = [ # backend_cache relies on pytest-cache, which is a stale package from 2013 diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index cfcc4d36299..d7d20f19ea7 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -2,11 +2,11 @@ , buildPythonPackage , fetchPypi , requests -, requests_toolbelt +, requests-toolbelt , requests_oauthlib , pytest -, pytestrunner -, pytestcov +, pytest-runner +, pytest-cov , responses }: @@ -19,9 +19,9 @@ buildPythonPackage rec { sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; }; - propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; + propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytestcov responses ]; + checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index ce2ead246f9..40ce524c667 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook -, atpublic, psutil, pytestcov, sybil +, atpublic, psutil, pytest-cov, sybil }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ atpublic psutil ]; - checkInputs = [ pytestCheckHook pytestcov sybil ]; + checkInputs = [ pytestCheckHook pytest-cov sybil ]; # disable code coverage checks for all OS. Upstream does not enforce these # checks on Darwin, and code coverage cannot be improved downstream nor is it diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index a6982037c1e..d9516ceb88b 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , fonttools, setuptools-scm -, pytest, pytestrunner +, pytest, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "A collection of objects that implement fast font, glyph, etc. math"; diff --git a/pkgs/development/python-modules/fritzprofiles/default.nix b/pkgs/development/python-modules/fritzprofiles/default.nix new file mode 100644 index 00000000000..17716e5fc95 --- /dev/null +++ b/pkgs/development/python-modules/fritzprofiles/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "fritzprofiles"; + version = "0.6.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bd4sa3i1ldkg6lnsvg004csgqklvi5xk71y971qyjvsbdbwgbn3"; + }; + + propagatedBuildInputs = [ + lxml + requests + ]; + + pythonImportsCheck = [ + "fritzprofiles" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Tool to switch the online time of profiles in the AVM Fritz!Box"; + homepage = "https://github.com/AaronDavidSchneider/fritzprofiles"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f755bb8cf8f..2c54bc4910b 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner +, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pytestrunner + pytest-runner cached-property frozendict pystache diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index a65de61b6db..691af2eda84 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , setuptools -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , twisted @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; }; - nativeBuildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytest-runner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 71aae7b66ad..3c5de1295c2 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gios"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "031z5j1j961pcw8s4ajj5z2xn2jxb2hyfn3x3bxbaagwl9a5qkvn"; + sha256 = "sha256-7+np1lUbBFSTJNAD6OT5k89MM+kzEj90JlulXGm36k8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 92ddbbd73f7..57b58699ec3 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -15,7 +15,7 @@ , pyopenssl , pyyaml , requests -, requests_toolbelt +, requests-toolbelt , terminaltables , websocket-client }: @@ -53,7 +53,7 @@ buildPythonPackage rec { pyopenssl pyyaml requests - requests_toolbelt + requests-toolbelt terminaltables websocket-client ]; diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 2d2658e00f8..6056d215d22 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -4,7 +4,7 @@ , pyparsing , future , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; patches = [ ./no-setup-requires-pytestrunner.patch ]; diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 758f988a239..37ff849a3cb 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , hyppo , matplotlib , networkx @@ -36,7 +36,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 7236f7c22e3..0e095126676 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.38.1"; + version = "1.39.0"; src = fetchPypi { inherit pname version; - sha256 = "cd85f58038b92e1961f8127d79691e84e151390d35cae73c4c0cbe2042f76b77"; + sha256 = "39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index adb131868c7..0e8d0746598 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , python-dateutil , babelfish , rebulk @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require more packages. doCheck = false; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ python-dateutil babelfish rebulk ]; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index 7d43ce95a7e..a7a418afa18 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index c1f36c20566..ba948a68915 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 946f0039a0a..cba02387be5 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.0"; - disabled = pythonOlder "3.5"; + version = "3.5.1"; + disabled = pythonOlder "3.6"; # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1vzlfx0gpidl0rzv4z94pziwm6rj4lrilly5pykgq984y708pcqf"; + sha256 = "sha256-ZHTqlb7LIDp8MFNW8MFg6jX7QwaxT40cLi3H13ONLCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index abfc4523965..9a7ab056a31 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.14"; + version = "0.2.19"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-sCGUlEN1ejWhc2+9JRQ7UPqueq30u8gGSPRxbs4cnLE="; + sha256 = "sha256-h1idJJd2lPV3+tAE59gzITa7jmtBhcEpRuyflf76EAk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 1d6d6b39d04..21af8addaac 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -9,8 +9,8 @@ , pandas , codecov , pytest -, pytestcov -, pytestrunner +, pytest-cov +, pytest-runner , coveralls , twine , check-manifest @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index 680c4a5a726..7870247e2fd 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "homepluscontrol"; - version = "0.0.5"; + version = "0.0.61"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "chemaaa"; repo = pname; rev = version; - sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93"; + sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index de2f9b00f53..c6c7b337214 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -8,7 +8,7 @@ , pproxy , pytest-asyncio , pytestCheckHook -, pytestcov +, pytest-cov , sniffio , trio , trustme @@ -38,7 +38,7 @@ buildPythonPackage rec { pproxy pytest-asyncio pytestCheckHook - pytestcov + pytest-cov trio trustme uvicorn diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index b45c3e85f50..e5db065defc 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -11,7 +11,7 @@ , pytestCheckHook , pytest-asyncio , pytest-trio -, pytestcov +, pytest-cov , trustme , uvicorn }: @@ -41,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-trio - pytestcov + pytest-cov trustme uvicorn ]; diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 5b086d5f1a7..47bc8860bc5 100644 --- a/pkgs/development/python-modules/hypothesis/2.nix +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34, pexpect -, doCheck ? true, pytest, pytest_xdist, flaky, mock +, doCheck ? true, pytest, pytest-xdist, flaky, mock , sortedcontainers }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { sortedcontainers ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; + checkInputs = [ pytest pytest-xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 9fdeca082b2..8dcca1983ba 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytestCheckHook , pytestcov , numba +, pytestCheckHook , pytest-cov , numba , numpy , scikit-learn , scipy @@ -30,7 +30,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + checkInputs = [ pytestCheckHook pytest-cov matplotlib seaborn ]; disabledTestPaths = [ "docs" "benchmarks" diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a63617ba2a2..8e7f4832c25 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -5,7 +5,7 @@ , pyjwt , pylint , pytestCheckHook -, pytestcov +, pytest-cov , python-dateutil , requests , responses @@ -25,7 +25,7 @@ buildPythonPackage rec { codecov pylint pytestCheckHook - pytestcov + pytest-cov responses tox ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index b82fe568e2a..432767b9f98 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytest_xdist +, pytest-xdist , pythonOlder , matplotlib , mock @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij"; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; + checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ]; propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index ed5179d6db5..a59f7e08b98 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: buildPythonPackage { pname = "image-match"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ scikitimage diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 86bad819a6f..9f78d86a2be 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -3,7 +3,7 @@ , six , hypothesis , pytest -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ arrow six ]; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index e55fd8f39d5..84e381f0b8c 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; @@ -20,7 +20,7 @@ buildPythonPackage rec { --replace "readchar==2.0.1" "readchar>=2.0.0" ''; - checkInputs = [ pytest pytestcov pexpect pytest-mock ]; + checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; checkPhase = '' pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index 0f0466c8b3e..cc56f8d0bde 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flexmock , pytest -, pytestcov +, pytest-cov , six }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ flexmock pytest - pytestcov + pytest-cov six ]; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index a0efa9b575d..3f8811f4f3b 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov , nbval , ipywidgets , numpy @@ -29,7 +29,7 @@ buildPythonPackage rec { traittypes ]; - checkInputs = [ pytest pytestcov nbval ]; + checkInputs = [ pytest pytest-cov nbval ]; checkPhase = "pytest ipydatawidgets/tests"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 305b9f6c6b6..0dba5e8f192 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -14,7 +14,7 @@ buildPythonPackage rec { fetchSubmodules = true; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 78aaadf690e..a3f790abfc5 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytestcov -, requests, requests_oauthlib, requests_toolbelt, defusedxml +, pytest, pytest-runner, pbr, glibcLocales , pytest-cov +, requests, requests_oauthlib, requests-toolbelt, defusedxml , ipython }: @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; + buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; + propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers doCheck = false; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 82ddb3bf23a..d16fa89a97c 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, six -, flake8, pep8-naming, pytest, pytestcov }: +, flake8, pep8-naming, pytest, pytest-cov }: buildPythonPackage rec { pname = "jsonlines"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ flake8 pep8-naming pytest pytestcov ]; + checkInputs = [ flake8 pep8-naming pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 7f1a729b5b1..2c60d7b3b27 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,7 +10,6 @@ , jupyter_server , openapi-core , pytest-tornasync -, pytestcov , ruamel-yaml , strict-rfc3339 }: diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index e90dd1a806a..28b09222b47 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, pytest_xdist +, pytest, pytest-cov, pytest-xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -15,8 +15,8 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov - pytest_xdist + pytest-cov + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 4134c47084a..3d1575d8c37 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }: buildPythonPackage rec { pname = "keyutils"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ keyutils ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 60eba0577b0..fe35126ea26 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5334513e23c..24d8ada5890 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, - unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, + unidecode, mock, pytest , backports-shutil-which, configargparse, python-daemon, pymsgbox }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c"; }; - propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse + propagatedBuildInputs = [ unidecode backports-shutil-which configargparse python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 33710c6682d..8985e8fbcf5 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytestcov, coverage + six, pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix index 52c1cf9a9d7..c59e026fe4f 100644 --- a/pkgs/development/python-modules/libcloud/2.nix +++ b/pkgs/development/python-modules/libcloud/2.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 0449f609958..78afad13dd2 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 669f16e5f92..3efe41e0079 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook -, pytest-mock, pytestrunner, six, tornado_4 }: +, pytest-mock, pytest-runner, six, tornado_4 }: buildPythonPackage rec { pname = "lomond"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; # Makes HTTP requests diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index a5ea55c39cf..19bb14419a4 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytest-runner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six beautifulsoup4 requests ]; # upstream has no code tests doCheck = false; diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 01ff1458c0f..decad482bef 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytestcov }: +{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytest-cov }: buildPythonPackage rec { pname = "m3u8"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; - checkInputs = [ bottle pytest pytestcov ]; + checkInputs = [ bottle pytest pytest-cov ]; checkPhase = '' pytest tests/test_{parser,model,variant_m3u8}.py diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 69f272c409d..ade031409b4 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , cython -, pytestrunner +, pytest-runner , pytestCheckHook , hypothesis }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython - pytestrunner + pytest-runner ]; preBuild = '' diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 94cfb637a15..04e59287a86 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytestcov, coverage }: + pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index e3b629b3034..aa2784cd1db 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,7 +4,7 @@ , marshmallow # Check Inputs , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; meta = with lib; { description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 794b2c8f4ad..8ee3d60f801 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -5,7 +5,7 @@ , hopcroftkarp , multiset , pytest -, pytestrunner +, pytest-runner , hypothesis , setuptools-scm , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest>=3.0,<4.0" "pytest" ''; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index b8439a0c23d..354eace5047 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, pytest, pytestrunner, responses +, pytest, pytest-runner, responses }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; }; - checkInputs = [ pytest pytestrunner responses ]; + checkInputs = [ pytest pytest-runner responses ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index f61ace8960d..9ab850ed010 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.9.6"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "1810deb7f780700e7e0734e1844c1b4b2525ee990b8665f7b98e3f335a31bbcf"; + sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 03343aec16e..f20cb18b488 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }: buildPythonPackage rec { pname = "mccabe"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; meta = with lib; { description = "McCabe checker, plugin for flake8"; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index c3ce875b4f5..30969501213 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k -, sympy, pytest, pytestrunner, sphinx, setuptools-scm }: +, sympy, pytest, pytest-runner, sphinx, setuptools-scm }: buildPythonPackage rec { pname = "measurement"; @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's|use_scm_version=True|version="${version}"|' setup.py ''; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 77e6f9c2468..2dfe06d5177 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -5,7 +5,7 @@ , numpy , scipy , pytestCheckHook -, pytestcov +, pytest-cov , pytest-timeout , h5py , matplotlib @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest-timeout h5py matplotlib diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 555011a314d..ec19843ab9d 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytestcov +, pytestCheckHook, pytest-runner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytest-runner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index e183031b8d9..fa2fa87d0e8 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytestrunner +, pytest-runner , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; }; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 2eed1eefeec..bffc4247632 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six -, pytest, pytestcache, pytestcov, responses, mock +, pytest, pytestcache, pytest-cov, responses, mock }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; - checkInputs = [ pytest pytestcache pytestcov responses mock ]; + checkInputs = [ pytest pytestcache pytest-cov responses mock ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 8c29971afe7..c1e57be4ded 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner ]; meta = with lib; { diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index d475f21fcb5..e7a2a6808a8 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-mock , hypothesis , glibcLocales @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock hypothesis glibcLocales diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 221915efca0..96fc94d43e8 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -5,7 +5,7 @@ , attrs , py , setuptools -, pytestcov +, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis - pytestcov + pytest-cov pytest-timeout pytest-tornado jsonschema diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index b9a336f7fbe..17698649255 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -11,7 +11,7 @@ , glibcLocales , matplotlib , sympy -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestCheckHook matplotlib sympy - pytestcov + pytest-cov ]; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index b69e8401eb5..cd70025d610 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, watchdog, flake8 -, pytest, pytestrunner, coverage, sphinx, twine }: +, pytest, pytest-runner, coverage, sphinx, twine }: buildPythonPackage rec { pname = "ndjson"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; - checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ]; + checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; meta = with lib; { homepage = "https://github.com/rhgrant10/ndjson"; diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix new file mode 100644 index 00000000000..566540a4c97 --- /dev/null +++ b/pkgs/development/python-modules/nengo/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, numpy +, scipySupport ? false, scipy +, scikitSupport ? false, scikit-learn +}: + +buildPythonPackage rec { + pname = "nengo"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "nengo"; + repo = "nengo"; + rev = "v${version}"; + sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh"; + }; + + propagatedBuildInputs = [ numpy ] + ++ lib.optionals scipySupport [ scipy ] + ++ lib.optionals scikitSupport [ scikit-learn ]; + + # checks req missing: + # pytest-allclose + # pytest-plt + # pytest-rng + doCheck = false; + + pythonImportsCheck = [ "nengo" ]; + + meta = with lib; { + description = "A Python library for creating and simulating large-scale brain models"; + homepage = "https://nengo.ai/"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ arjix ]; + }; +} diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 9cf8618bb30..4787d9d6f76 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -2,6 +2,7 @@ , aiohttp , aioresponses , buildPythonPackage +, dacite , fetchFromGitHub , pytest-asyncio , pytest-error-for-skips @@ -11,18 +12,19 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "0.2.6"; + version = "1.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp"; + sha256 = "sha256-VTKIUo3rR/HyEW/d/Nm0fm7wbgSdLGf02i8R3om1oCE="; }; propagatedBuildInputs = [ aiohttp + dacite ]; checkInputs = [ diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 078c455a637..8d0c597a1af 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -19,14 +19,14 @@ , pybids , pydot , pytest -, pytest_xdist +, pytest-xdist , pytest-forked , rdflib , scipy , simplejson , traits , xvfbwrapper -, pytestcov +, pytest-cov , codecov , sphinx # other dependencies @@ -93,8 +93,8 @@ buildPythonPackage rec { mock pytest pytest-forked - pytest_xdist - pytestcov + pytest-xdist + pytest-cov which ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 597b6814281..0821e0b763d 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -6,7 +6,7 @@ , effect , git , pytestCheckHook -, pytestcov +, pytest-cov , pythonOlder }: @@ -29,7 +29,7 @@ buildPythonPackage rec { effect ]; - checkInputs = [ pytestCheckHook pytestcov git ]; + checkInputs = [ pytestCheckHook pytest-cov git ]; # ignore tests which are impure disabledTests = [ "network" "requires_nix_build" ]; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index c2f484cb3a9..7d29428d93e 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -1,5 +1,5 @@ { blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest -, webtest, pytestcov, pytest-django, pytest-pythonpath, flake8, sqlalchemy +, webtest, pytest-cov, pytest-django, pytest-pythonpath, flake8, sqlalchemy , flask_sqlalchemy, peewee }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { mock pytest webtest - pytestcov + pytest-cov pytest-django pytest-pythonpath flake8 diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 53577567bf6..f9c27b4c79a 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }: +{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }: buildPythonPackage rec { pname = "numpy-stl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; checkPhase = "py.test"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index ad9da46243b..42249e93378 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: +, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { pname = "omegaconf"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; meta = with lib; { diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index f09a42ddd69..18e357c1f2d 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,7 +5,7 @@ , isodate , jsonschema , pytest-flake8 -, pytestcov +, pytest-cov , rfc3339-validator , six , strict-rfc3339 @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytestcov pytest-flake8 ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index b431ef50752..4e61a86a501 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytestcov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: buildPythonPackage rec { pname = "openapi-spec-validator"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] ++ (lib.optionals (isPy27) [ pathlib ]); - checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; + checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; meta = with lib; { homepage = "https://github.com/p1c2u/openapi-spec-validator"; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index 872a5407612..f2dd196be94 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -5,7 +5,7 @@ , typesystem , aiosqlite , pytestCheckHook -, pytestcov +, pytest-cov , typing-extensions }: @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ aiosqlite pytestCheckHook - pytestcov + pytest-cov typing-extensions ]; diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 1bbb713f40b..c63c6df86f9 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -6,7 +6,7 @@ # For tests/setup.py , pytest -, pytestrunner +, pytest-runner , requests-mock }: @@ -17,11 +17,11 @@ buildPythonPackage rec { inherit pname version; sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; checkInputs = [ pytest - pytestrunner + pytest-runner requests-mock ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 92f8f5d90f1..e8344e88f11 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, stdenv, pytestrunner, pytest, mock }: +, stdenv, pytest-runner, pytest, mock }: buildPythonPackage rec { pname = "paho-mqtt"; @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--pylama" "" ''; - checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ pytest-runner pytest ] ++ lib.optional (!isPy3k) mock; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 9af09d56946..5b9a6d8e968 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -19,7 +19,7 @@ , backports_tempfile , isPy27 , pytest -, pytestcov +, pytest-cov , pytest-mock }: @@ -54,7 +54,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 3e7c6ae0011..72eb9a185d7 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pytestcov +, python-doi, isPy3k, pytest-cov #, optional, dependencies , whoosh, pytest , stdenv @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; checkInputs = ([ - pytest pytestcov + pytest pytest-cov ]) ++ [ xdg-utils ]; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index decb15ff5e6..709b257e337 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi , buildPythonPackage, pythonOlder -, pytest, pytestrunner +, pytest, pytest-runner , parse, six, enum34 }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; checkPhase = '' diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 77196a7c0e9..ba3662a44b0 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestrunner +, pytest-runner , future }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ future ]; meta = with lib; { diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 533a4dc3a30..71b670b707c 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytestrunner +, pytest-runner , pytest }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; # Certain tests require network checkPhase = '' diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 672708b0fd9..b5d429de081 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , pytest }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 783d85b6c08..7c08468c03f 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }: +{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }: buildPythonPackage rec { pname = "periodictable"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; }; - checkInputs = [ pytestcov pytestCheckHook ]; + checkInputs = [ pytest-cov pytestCheckHook ]; meta = { homepage = "https://www.reflectometry.org/danse/software.html"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 6a0f8940788..8184c6d0d18 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy3k , setuptools -, pytestcov +, pytest-cov , pytest }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; pythonImportsCheck = [ "pglast" ]; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 8eab09046dc..54a81664381 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -7,7 +7,7 @@ , attrs , espeak-ng , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonApplication rec { @@ -45,7 +45,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; # We tried to package festvial, but were unable to get the backend running, diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 262bdceb5db..75bc033807f 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -26,5 +26,5 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ plaster PasteDeploy ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 82aaebb1003..749ffdb7f32 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -15,5 +15,5 @@ buildPythonPackage rec { py.test ''; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 5c41c3308be..d2e04586e38 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "4.5.2"; + version = "4.6.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-9rdpisEuLUO7oO7+7SQb4fXqRG30rf4R7bSFY+QpMhM="; + sha256 = "sha256-WL5UBsvAdtfOCkVX9NI0Z2fJ2CAO+NwD8wvkvkJ2uww="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index c37c428805e..7287797ef33 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -13,7 +13,7 @@ , pkginfo , poetry-core , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -71,7 +71,7 @@ buildPythonPackage rec { "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; - checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ]; + checkInputs = [ pytestCheckHook httpretty pytest-mock pytest-cov ]; preCheck = "export HOME=$TMPDIR"; disabledTests = [ # touches network diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 7b4fc177bc1..eee4a1047fd 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,7 +1,5 @@ { lib, buildPythonPackage, fetchPypi , pytestCheckHook -, pytestcov -, pytest-flake8 , pytest-mypy , redis }: diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index da27dd3cd92..d48f387400e 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, tempora, pytest-black, pytestcov }: +, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }: buildPythonPackage rec { pname = "portend"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black pytestcov ]; + checkInputs = [ pytest pytest-black pytest-cov ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index b13808f1a9d..0f18a6ad207 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -7,8 +7,8 @@ , six , semver , pytestCheckHook -, pytestcov -, pytestrunner +, pytest-cov +, pytest-runner , openapi-spec-validator }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov openapi-spec-validator ]; diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 242300949ec..13ecab806c4 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -4,7 +4,7 @@ , betamax-matchers , mock , six -, pytestrunner +, pytest-runner , prawcore , pytest , requests-toolbelt @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 686487c0256..cb72e69af77 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -4,7 +4,7 @@ , requests , testfixtures , mock -, requests_toolbelt +, requests-toolbelt , betamax , betamax-serializers , betamax-matchers @@ -32,7 +32,7 @@ buildPythonPackage rec { betamax betamax-serializers betamax-matchers - requests_toolbelt + requests-toolbelt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix new file mode 100644 index 00000000000..d5837fd90a1 --- /dev/null +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prefixed"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ca48277ba5fa8346dd4b760847da930c7b84416387c39e93affef086add2c029"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "prefixed" ]; + + meta = with lib; { + description = "Prefixed alternative numeric library"; + homepage = "https://github.com/Rockhopper-Technologies/prefixed"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index ad47163e484..f50f9625fd9 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytest-cov }: buildPythonPackage rec { pname = "property-manager"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { description = "Useful property variants for Python programming"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 01b249e1c77..ff312cbff89 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytestcov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { @@ -31,8 +31,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov - pytest_xdist + pytest-cov + pytest-xdist ]; disabledTests = [ # Test that fails on pytest >= v6 diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 2f494dcb700..869aea01a29 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytest-runner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-runner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index b229361917f..87cfd6b8e42 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -4,7 +4,7 @@ , lib , morphys , pytest -, pytestrunner +, pytest-runner , python-baseconv , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix new file mode 100644 index 00000000000..2c7dc8e52ea --- /dev/null +++ b/pkgs/development/python-modules/py17track/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, attrs +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "py17track"; + version = "3.3.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1rnq9ybzj2l3699mjyplc29mxla8fayh52x52cnsz21ixlfd9fky"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + attrs + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ">=19.3,<21.0" ">=19.3,<22.0" + ''; + + # Ignore the examples directory as the files are prefixed with test_ + disabledTestPaths = [ "examples/" ]; + + pythonImportsCheck = [ "py17track" ]; + + meta = with lib; { + description = "Python library to track package info from 17track.com"; + homepage = "https://github.com/bachya/py17track"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index 0ce28e57492..2e178163c10 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,11 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: +{ lib +, buildPythonPackage +, fetchPypi +, latexcodec +, pyyaml +, setuptools +}: buildPythonPackage rec { version = "0.24.0"; pname = "pybtex"; doCheck = false; - propagatedBuildInputs = [ latexcodec pyyaml ]; + pythonImportsCheck = [ "pybtex" ]; + + propagatedBuildInputs = [ + latexcodec + pyyaml + setuptools + ]; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 55f30f9e55a..ec902e0b385 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -1,11 +1,11 @@ { buildPythonPackage , callPackage -, pytestcov +, pytest-cov , fetchPypi , lib , pytest , pythonOlder -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -18,13 +18,13 @@ buildPythonPackage rec { sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; # Is private because the author states it's unmaintained # and shouldn't be used in production code propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { homepage = "https://gitlab.com/danielhones/pycategories"; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index c202e5df19b..c6029d216d6 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "79"; + version = "80"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-I29UIyHjsIymZxcE084hQoyaEMTXIIQPFcB8lsxY+UI="; + sha256 = "sha256-om1Nhqu2CU+W2k2PGP1+6jLRJihacSQDayOfTzblZKo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index a0924fa7f63..539fb9b929d 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , numpy , pillow @@ -36,7 +36,7 @@ buildPythonPackage { propagatedBuildInputs = [ numpy pillow ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 833b83b3913..f4afd49bbc2 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -2,7 +2,7 @@ , fetchPypi , lib , vcversioner -, pytestrunner +, pytest-runner , mock , pytest , pytest-asyncio @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest pytest-asyncio pytest-trio - pytestrunner + pytest-runner twisted ] ++ lib.optional isPy27 [ attrs diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index a714bbfaba9..dc390120f60 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.7"; + version = "0.1.9"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; + sha256 = "1ybhs09wyzzaryghd6ijxhajp3677x63c4qzqsgln1mmxhj8wm5k"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index ec4cff2de61..eb6734649b5 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -6,7 +6,7 @@ , flask , pyquery , pytest -, pytestrunner +, pytest-runner , cairosvg , tinycss , cssselect @@ -38,7 +38,7 @@ buildPythonPackage rec { # Should be a check input, but upstream lists it under "setup_requires". # https://github.com/Kozea/pygal/issues/430 - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix new file mode 100644 index 00000000000..58f65b6d0f4 --- /dev/null +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -0,0 +1,53 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchFromGitHub +, pygame +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pygame-gui"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "MyreMylar"; + repo = "pygame_gui"; + rev = "v_${lib.replaceStrings ["."] [""] version}"; + sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE="; + }; + + propagatedBuildInputs = [ pygame ]; + + postPatch = '' + substituteInPlace pygame_gui/core/utility.py \ + --replace "xsel" "${pkgs.xsel}/bin/xsel" + ''; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$TMPDIR + export SDL_VIDEODRIVER=dummy + ''; + + disabledTests = [ + # Clipboard doesn't exist in test environment + "test_process_event_text_ctrl_c" + "test_process_event_text_ctrl_v" + "test_process_event_text_ctrl_v_nothing" + "test_process_event_ctrl_v_over_limit" + "test_process_event_ctrl_v_at_limit" + "test_process_event_ctrl_v_over_limit_select_range" + "test_process_event_text_ctrl_v_select_range" + "test_process_event_text_ctrl_a" + "test_process_event_text_ctrl_x" + ]; + + meta = with lib; { + description = "A GUI system for pygame"; + homepage = "https://github.com/MyreMylar/pygame_gui"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 333312d6aa0..bcdce070c63 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,5 +1,6 @@ { lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype +, fontconfig }: buildPythonPackage rec { @@ -20,9 +21,6 @@ buildPythonPackage rec { portmidi libX11 freetype ]; - # Tests fail because of no audio device and display. - doCheck = false; - preConfigure = '' sed \ -e "s/origincdirs = .*/origincdirs = []/" \ @@ -39,9 +37,18 @@ buildPythonPackage rec { LOCALBASE=/ ${python.interpreter} buildconfig/config.py ''; + checkInputs = [ fontconfig ]; + + preCheck = '' + # No audio or video device in test environment + export SDL_VIDEODRIVER=dummy + export SDL_AUDIODRIVER=disk + export SDL_DISKAUDIOFILE=/dev/null + ''; + meta = with lib; { description = "Python library for games"; - homepage = "http://www.pygame.org/"; + homepage = "https://www.pygame.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 64573a1a528..5dbb3d6750f 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, setuptools }: + pytest, pytest-runner, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; diff --git a/pkgs/development/python-modules/pyls-flake8/default.nix b/pkgs/development/python-modules/pyls-flake8/default.nix new file mode 100644 index 00000000000..495c54d5859 --- /dev/null +++ b/pkgs/development/python-modules/pyls-flake8/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flake8 +, python-lsp-server +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyls-flake8"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emanspeaks"; + repo = "pyls-flake8"; + rev = "3df8606ad821100e64743f457c77c20170bde722"; + sha256 = "14wkmwh8mqr826vdzxhvhdwrnx2akzmnbv3ar391qs4imwqfjx3l"; + }; + + propagatedBuildInputs = [ flake8 python-lsp-server ]; + + meta = with lib; { + homepage = "https://github.com/emanspeaks/pyls-flake8"; + description = "A Flake8 plugin for the Python LSP Server."; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 35b43969e52..a11acce3c8b 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -1,29 +1,29 @@ { lib, buildPythonPackage, fetchFromGitHub -, python-language-server, isort +, python-lsp-server, isort }: buildPythonPackage rec { pname = "pyls-isort"; - version = "0.1.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "pyls-isort"; - rev = version; - sha256 = "0mf8c6dw5lsj9np20p0vrhr1yfycq2awjk2pil28l579xj9nr0dc"; + rev = "v${version}"; + sha256 = "0xba0aiyjfdi9swjzxk26l94dwlwvn17kkfjfscxl8gvspzsn057"; }; # no tests doCheck = false; propagatedBuildInputs = [ - isort python-language-server + isort python-lsp-server ]; meta = with lib; { homepage = "https://github.com/paradoxxxzero/pyls-isort"; - description = "Isort plugin for python-language-server"; + description = "Isort plugin for python-lsp-server"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index f919ac21cb7..acce4469eed 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , fetchpatch }: @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock pytestcov coverage pytestCheckHook ]; + checkInputs = [ mock pytest-cov coverage pytestCheckHook ]; propagatedBuildInputs = [ mypy python-language-server configparser diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix new file mode 100644 index 00000000000..a7d13bb32a2 --- /dev/null +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, mypy +, pytestCheckHook +, python-lsp-server +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pylsp-mypy"; + version = "0.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Richardk2n"; + repo = "pylsp-mypy"; + rev = version; + sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr"; + }; + + checkInputs = [ pytestCheckHook mock ]; + + propagatedBuildInputs = [ mypy python-lsp-server ]; + + meta = with lib; { + homepage = "https://github.com/Richardk2n/pylsp-mypy"; + description = "Mypy plugin for the Python LSP Server"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index a6778a4aa7e..80fa5bff320 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -11,7 +11,7 @@ , pyflakes , pytest , pytestcache -, pytestcov +, pytest-cov , covCore , pytest-flakes , sphinx @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ - flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore pytest-flakes sphinx mock chalice ]; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index 72f362f85c4..87d46a35fa8 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -2,7 +2,7 @@ , fetchurl , buildPythonPackage , pymatgen -, pytestrunner +, pytest-runner , pytestCheckHook , isPy3k }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix new file mode 100644 index 00000000000..92918efa8ed --- /dev/null +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, cffi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pymunk"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "04jqqd2y0wzzkqppbl08vyzgbcpl5qj946w8da2ilypqdx7j2akp"; + }; + + propagatedBuildInputs = [ cffi ]; + + preBuild = '' + ${python.interpreter} setup.py build_ext --inplace + ''; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + "pymunk/tests" + ]; + + meta = with lib; { + description = "2d physics library"; + homepage = "https://www.pymunk.org"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 244b366081c..67079a8c1d2 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -6,7 +6,7 @@ , greenlet , pythonOlder , isPyPy -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; # Tests require pkgs.neovim, diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix index c25b1b11435..07c657bf226 100644 --- a/pkgs/development/python-modules/pyosf/default.nix +++ b/pkgs/development/python-modules/pyosf/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , requests }: @@ -19,7 +19,7 @@ buildPythonPackage rec { }; preBuild = "export HOME=$TMP"; - buildInputs = [ pytestrunner ]; # required via `setup_requires` + buildInputs = [ pytest-runner ]; # required via `setup_requires` propagatedBuildInputs = [ requests ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index fd2b9d46185..54a136d5dcd 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,26 +1,57 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, scipy , numpy -, pyopengl , pyqt5 -, scipy +, pyopengl +, qt5 +, python +, pytestCheckHook +, freefont_ttf +, makeFontsConf +, fetchpatch }: +let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; +in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.12.1"; + version = "0.12.2"; - src = fetchPypi { - inherit pname version; - sha256 = "d2ef3b5289184fb48dfe5f44ccb58d9d64ffb5452fc524a2bd7a640a36b3874d"; + src = fetchFromGitHub { + owner = "pyqtgraph"; + repo = "pyqtgraph"; + rev = "pyqtgraph-${version}"; + sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d"; }; - propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ]; + # TODO: remove when updating to 0.12.3 + patches = [ + (fetchpatch { + url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch"; + sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00"; + }) + ]; + + propagatedBuildInputs = [ + numpy + pyqt5 + scipy + pyopengl + ]; - doCheck = false; # tries to create windows (QApps) on collection, which fails (probably due to no display) + checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "pyqtgraph" ]; + preCheck = '' + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks + export FONTCONFIG_FILE=${fontsConf} + ''; meta = with lib; { description = "Scientific Graphics and GUI Library for Python"; diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 8a6452fb668..15d40bce9fa 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "8e997cf28c3ae7ccc90caa84aa3a3ed9245fac3e9cf76efb1467e4f4800143dc"; + sha256 = "sha256-nKnOWVPRFmylwUeb0yApMHdW8vGvPCLlOGkZGNYC128="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index b8570427d30..4f295dfc7c2 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner +, pytest-runner , numpy , pyyaml }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy pyyaml ]; # Tests require git lfs download of repository diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index 963e621986c..acc55503582 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -3,7 +3,7 @@ , fetchPypi , fetchpatch , pytest -, pytestcov +, pytest-cov , pytestCheckHook , numpy , astropy @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov numpy scipy h5py diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 0253ed5a513..47cc882f548 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -5,7 +5,7 @@ , django , setuptools-scm , django-configurations -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest setuptools-scm ]; - checkInputs = [ pytest django-configurations pytest_xdist six ]; + checkInputs = [ pytest django-configurations pytest-xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 39d6bc127e6..eea6c61a727 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -7,7 +7,7 @@ , pytest , pytestcache , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { mock pytestCheckHook pytestcache - pytestcov + pytest-cov ]; pytestFlagsArray = [ "--ignore=docs" ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 148b2c7185f..df152eaa5ec 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-doctestplus , pytestCheckHook , setuptools-scm @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytestcov + pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 16a1fb92dd6..e03e0fbe626 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -5,7 +5,7 @@ , pytest , pylint , six -, pytestrunner +, pytest-runner , toml }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index f8e240ca57e..0020a4bf433 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , factory_boy, faker, numpy, backports-entry-points-selectable -, pytestCheckHook, pytest_xdist +, pytestCheckHook, pytest-xdist }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist + pytest-xdist numpy factory_boy faker diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytest-runner/2.nix index bea83146c37..bea83146c37 100644 --- a/pkgs/development/python-modules/pytestrunner/2.nix +++ b/pkgs/development/python-modules/pytest-runner/2.nix diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix index d99f72299dd..d99f72299dd 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytest-runner/default.nix diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 0483063c53b..e43a837d6aa 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,5 +1,5 @@ { lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 8c59b6ee2c9..40f67eb0b0b 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -4,7 +4,7 @@ , pytest , pytestCheckHook , pexpect -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook pexpect pytestcov ]; + checkInputs = [ pytestCheckHook pexpect pytest-cov ]; disabledTests = [ "test_suppresses_timeout_when_pdb_is_entered" diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 8ea981ba2e7..c4a66cc48e5 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: +, pytest, pytest-cov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { pname = "pytest-virtualenv"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest pytest-cov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = "py.test tests/unit "; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index c8f1179bc66..861addf81ee 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytest-cov }: buildPythonPackage rec { pname = "python-hosts"; @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" "" ''; - checkInputs = [ pyyaml pytest pytestcov ]; + checkInputs = [ pyyaml pytest pytest-cov ]; # Removing 1 test file (it requires internet connection) and keeping the other two checkPhase = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index e641a943f86..a6d0bf800ea 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , future, futures ? null, ujson, isPy38 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytest-cov coverage ]; propagatedBuildInputs = [ future ujson ] diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 3ed9b75ef91..f022eba5857 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27 , backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky +, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -55,7 +55,7 @@ buildPythonPackage rec { doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage flaky + pytestCheckHook mock pytest-cov coverage flaky # Do not propagate flake8 or it will enable pyflakes implicitly flake8 # rope is technically a dependency, but we don't add it by default since we diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix new file mode 100644 index 00000000000..3c18d291e37 --- /dev/null +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -0,0 +1,32 @@ +{ lib +, black +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, python-lsp-server +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-lsp-black"; + version = "1.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = "python-lsp-black"; + rev = "v${version}"; + sha256 = "1blxhj70jxb9xfbd4dxqikd262n6dn9dw5qhyml5yvdwxbv0bybc"; + }; + + checkInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = [ black python-lsp-server ]; + + meta = with lib; { + homepage = "https://github.com/python-lsp/python-lsp-black"; + description = "Black plugin for the Python LSP Server"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 95208c7b94b..180264f102d 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -6,8 +6,8 @@ , pkgconfig , psutil , pytest -, pytestcov -, pytestrunner +, pytest-cov +, pytest-runner , setuptools-scm }: @@ -23,8 +23,8 @@ buildPythonPackage rec { sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; - nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; - checkInputs = [ pytest pytestcov psutil ]; + nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ]; + checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; # give a hint to setuptools-scm on package version diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index c2792342487..ccac3e8b3cb 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , mock , pyyaml , six @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pyyaml ]; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index fd488f4be9d..14d15df16f6 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -1,25 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, python +, pythonOlder +, text-unidecode +, unidecode +}: buildPythonPackage rec { - pname = "python-slugify"; - version = "4.0.1"; + pname = "python-slugify"; + version = "5.0.2"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; + }; - propagatedBuildInputs = [ text-unidecode ]; + propagatedBuildInputs = [ + text-unidecode + unidecode + ]; - checkPhase = '' - ${python.interpreter} test.py - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = with lib; { - homepage = "https://github.com/un33k/python-slugify"; - description = "A Python Slugify application that handles Unicode"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; - }; + pytestFlagsArray = [ "test.py" ]; + + pythonImportsCheck = [ "slugify" ]; + + meta = with lib; { + description = "Python Slugify application that handles Unicode"; + homepage = "https://github.com/un33k/python-slugify"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; } diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index c368d97633f..f6814a8d0fd 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, pytestrunner +, pytest-runner , future , requests , responses @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future requests requests_oauthlib ]; checkInputs = [ pytest responses hypothesis ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 10dc9f30572..cb25b09dad7 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , ply , networkx , decorator @@ -39,7 +39,7 @@ in buildPythonPackage rec { ]; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index d021b6b06d3..a6c2b1d381b 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9031"; + version = "9.0.9166"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA="; + sha256 = "0h7jw7blr4bal7pw711cxmwm4jjypchshc8ks04z2lyziy83ywja"; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 1a01eda244b..ea40fc573b6 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi +{ buildPythonPackage, fetchPypi, pytest-runner, pytestCheckHook, glib, vips, cffi , pkg-config, pkgconfig, lib }: buildPythonPackage rec { @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; - nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; + nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; buildInputs = [ glib vips ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 3a3e9bced05..b6e0684a2d4 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytestcov, pytest +, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytestcov pytest ]; + checkInputs = [ pytest-runner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 847eeb23c9a..0dd24112bd0 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytestcov +, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov } : buildPythonPackage rec { @@ -7,8 +7,8 @@ buildPythonPackage rec { version = "0.19.0"; checkInputs = [ - pytestrunner - pytestcov + pytest-runner + pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index ecb33f6adb1..d7f93b3a47e 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -9,19 +9,23 @@ buildPythonPackage rec { pname = "questionary"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmbo"; repo = pname; rev = version; - sha256 = "1x748bz7l2r48031dj6vr6jvvac28pv6vx1bina4lz60h1qac1kf"; + sha256 = "14k24fq2nmk90iv0k7pnmmdhmk8z261397wg52sfcsccyhpdw3i7"; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry + ]; - propagatedBuildInputs = [ prompt_toolkit ]; + propagatedBuildInputs = [ + prompt_toolkit + ]; checkInputs = [ pytest-cov @@ -32,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to build command line user prompts"; - homepage = "https://github.com/bachya/regenmaschine"; + homepage = "https://github.com/tmbo/questionary"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 85d5d5d0b7d..1ec6448d74c 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3, mock +, pytest, pytest-cov, packaging, hypothesis, boto3, mock , certifi, shapely }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index ea13c7083fe..c83a2bba1cd 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: buildPythonPackage rec { pname = "readchar"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytestcov pexpect ]; + checkInputs = [ pytest pytest-cov pexpect ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index fae0bf08e54..f422934f02f 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}: buildPythonPackage rec { pname = "rebulk"; @@ -11,7 +11,7 @@ buildPythonPackage rec { # Some kind of trickery with imports that doesn't work. doCheck = false; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ six regex ]; meta = with lib; { diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix index e9b8beadd16..9f5024daf7e 100644 --- a/pkgs/development/python-modules/reflink/default.nix +++ b/pkgs/development/python-modules/reflink/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lib , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; }; - propagatedBuildInputs = [ cffi pytestrunner ]; + propagatedBuildInputs = [ cffi pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 896bc8e02f0..873a39244fe 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , sphinx -, pytestcov +, pytest-cov , pytest , Mako , numpy @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; - checkInputs = [ sphinx pytestcov pytest ]; + checkInputs = [ sphinx pytest-cov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ lib.optional withCuda pycuda diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 64dafa7bca2..ce1dfc366f4 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.1"; + version = "0.7.2"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I="; + sha256 = "055dfyjm8dqwr62v86lyvq4r04692gmvlgp86218vwvzgm7p3p2c"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix new file mode 100644 index 00000000000..cc6eb312431 --- /dev/null +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchPypi, requests, lib }: + +buildPythonPackage rec { + pname = "requests-futures"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148"; + }; + + propagatedBuildInputs = [ requests ]; + + # tests are disabled because they require being online + doCheck = false; + + pythonImportsCheck = [ "requests_futures" ]; + + meta = with lib; { + description = "Asynchronous Python HTTP Requests for Humans using Futures"; + homepage = "https://github.com/ross/requests-futures"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ applePrincess ]; + }; +} diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 551c7f5b93e..e7e7ed5a738 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest -, pytestcov +, pytest-cov , numpy , scipy , cython @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ numpy scipy cython numba six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index eb9afc8353c..03aed296aa6 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , dill , numpy , pytorch @@ -25,7 +25,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; - checkInputs = [ dill pytestcov pytestCheckHook ]; + checkInputs = [ dill pytest-cov pytestCheckHook ]; disabledTests = [ "test_affine" ]; # deprecated division operator '/' diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index f50ad558176..e5043ca941a 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "rtoml"; - version = "0.6.1"; + version = "0.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "07bf30if1wmbqjp5n4ib43n6frx8ybyxc9fndxncq7aylkrhd7hy"; + sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1q082sdac5vm4l3b45rfjp4vppp9y9qhagdjqqfdz8gdhm1k8yyy"; + sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j"; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index c47054632c6..4e062d9928e 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -20,7 +20,7 @@ , wget , deepdiff , pytestCheckHook -, pytestcov +, pytest-cov , websocket-client }: @@ -61,7 +61,7 @@ buildPythonPackage rec { checkInputs = [ deepdiff pytestCheckHook - pytestcov + pytest-cov websocket-client ]; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 7f3e6527d06..5f0653236ac 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -6,7 +6,7 @@ , pytest , requests-mock , mock -, pytestcov +, pytest-cov , pytest-timeout , testtools }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml requests ]; - checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ]; + checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 6694c3abe4d..42f10aedf39 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -15,9 +15,9 @@ , ninja , pathpy , pytest -, pytestcov +, pytest-cov , pytest-mock -, pytestrunner +, pytest-runner , pytest-virtualenv , requests , six @@ -48,9 +48,9 @@ buildPythonPackage rec { ninja pathpy pytest - pytestcov + pytest-cov pytest-mock - pytestrunner + pytest-runner pytest-virtualenv requests six diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index f9f896a563b..643afd6dc8b 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytest-cov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; + checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index bb5cc138a74..58fa81b444f 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pkg-config , pytest -, pytestrunner +, pytest-runner , cffi , secp256k1 }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ cffi secp256k1 ]; # Tests are not included in archive diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index 26b8d732be1..f959458d265 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , virtualenv -, pytestrunner +, pytest-runner , pytest-virtualenv , twisted , pathlib2 @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = [ pytest virtualenv pytest-runner pytest-virtualenv ]; propagatedBuildInputs = [ twisted pathlib2 ]; postPatch = '' diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index dacd589b121..bf73e7561a1 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { name = "sfepy"; - version = "2020.4"; + version = "2021.2"; disabled = pythonOlder "3.8"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz"; + sha256 = "1vnynxzbspj900wjyy6020l71jdv2l1wkyax7nhi6w5wvav4kfwz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 3e2a90b496b..7bcd6340acf 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "10.0.0"; + version = "11.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-VF8R+dty54GuWvYs/OqWhfGtOVieuxtfndQUxHhu5lc="; + sha256 = "04fn65iwzgvxi44kgvgvxjr3nzi2f4hwlqrjxfvc5yda96qp347c"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index db3b8ed4312..3bbf28d2884 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , pytest -, pytestcov +, pytest-cov , flaky , numpy , pandas @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; + checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ]; disabledTests = [ # on CPU, these expect artifacts from previous GPU run diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index d22d6109958..d98d23fada6 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, rustPlatform, setuptools-rust }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }: buildPythonPackage rec { pname = "skytemple-rust"; @@ -17,6 +17,7 @@ buildPythonPackage rec { sha256 = "1ypcsf9gbq1bz29kfn7g4kg8741mxg1lfcbb14a0vfhjq4d6pnx9"; }; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index e96161228a5..c82eba66aca 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -10,7 +10,7 @@ , pytest-cov , pytest-mock , pytestCheckHook -, pytestrunner +, pytest-runner , requests , responses , six @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-cov pytest-mock pytestCheckHook - pytestrunner + pytest-runner responses ]; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index edadde8995e..af222674130 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.22.6"; + version = "0.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "06qar4syi6g3x84klnk0mg6w5ryl50c5k3s1hag4rimbkap3x6ks"; + sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 3c2a5e2a356..78ecb3face3 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -9,7 +9,7 @@ , pygments , urllib3 , pytest -, pytestcov +, pytest-cov , mock , sphinx , testtools @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; - checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix new file mode 100644 index 00000000000..8d408d300c7 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-copybutton"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-copybutton"; + rev = "v${version}"; + sha256 = "sha256-vrEIvQeP7AMXSme1PBp0ox5k8Q1rz+1cbHIO+o17Jqc="; + fetchSubmodules = true; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "sphinx_copybutton" ]; + + meta = with lib; { + description = "A small sphinx extension to add a \"copy\" button to code blocks"; + homepage = "https://github.com/executablebooks/sphinx-copybutton"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6c576f0b85e..37e89abf8da 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,16 +9,15 @@ , mock , pysqlite ? null , pytestCheckHook -, pytest_xdist }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.20"; + version = "1.4.22"; src = fetchPypi { inherit pname version; - sha256 = "1l5miq1nzvg51yqw3pnaq17dgibhgx2m0il2ha79gwpyd8k3mviq"; + sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 67a6dba1a8e..35f7d7c07c9 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -7,7 +7,7 @@ , sqlite-fts4 , tabulate , pytestCheckHook -, pytestrunner +, pytest-runner , black , hypothesis , sqlite @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner black hypothesis ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 68ca009d9dc..5339529f3d7 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }: buildPythonPackage rec { pname = "srptools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 904595865b8..510bbbac951 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -5,7 +5,7 @@ , cffi , six , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v"; }; - buildInputs = [ pkgs.ssdeep pytestrunner ]; + buildInputs = [ pkgs.ssdeep pytest-runner ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 6bbeb23ed1f..a9fdfe2050e 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , requests, six -, backports_unittest-mock, pytestCheckHook, pytestrunner }: +, backports_unittest-mock, pytestCheckHook, pytest-runner }: buildPythonPackage rec { pname = "sseclient"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # some tests use python3 strings doCheck = !isPy27; - checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; + checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 21c92fcee7e..8ea42d1f279 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -2,7 +2,7 @@ , coverage , mock , ply -, pytestrunner +, pytest-runner , pytestCheckHook , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { --replace "coverage==5.3" "coverage" ''; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ply six ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index cfdc173995c..7aa955e99e2 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 35aaf45ed1a..97a7d6ebbdd 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -5,7 +5,7 @@ , dnspython , requests , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 5f51112324a..8628c83334b 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index aaa04991641..92cd344edb6 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , hypothesis , isPy3k }: @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov hypothesis ]; diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 3e785d8febb..62dec6f348e 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -4,7 +4,7 @@ , requests , mock , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index 6b80f55636a..e7f6c2805de 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -5,7 +5,7 @@ , stups-tokens , stups-cli-support , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index cedbb7bcf78..e334608bd4d 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -19,8 +19,8 @@ , vcrpy , pytest , pytest-flakes -, pytestcov -, pytestrunner +, pytest-cov +, pytest-runner }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytestcov pytestrunner + pytest-cov pytest-runner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index c8fd82043a8..0079b44cfd3 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -19,7 +19,7 @@ , parfive , pytest-astropy , pytest-mock -, pytestcov +, pytest-cov , python-dateutil , scikitimage , scipy @@ -68,7 +68,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pytest-astropy - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 39be204a3d3..e983dfc0e7f 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; + sha256 = "04ywkbgs1lnnlhxakbr96crwc8hl97px8w7yigps2ki69md0xf60"; }; postPatch = '' @@ -35,7 +35,9 @@ buildPythonPackage rec { --replace 'attrs = "^20.3.0"' 'attrs = "*"' ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiodns @@ -53,6 +55,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "surepy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b6754e15ad5..404edac7e59 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -4,7 +4,7 @@ , pandas , setuptools-scm , pytest -, pytestcov +, pytest-cov , pyyaml , unicodecsv , xlrd @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytest pytestcov unicodecsv pandas ]; + checkInputs = [ pytest pytest-cov unicodecsv pandas ]; # test_tablib needs MarkupPy, which isn't packaged yet checkPhase = '' diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index d5dfda53c08..83f6d9ac063 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, regex -, pytestrunner, pytestCheckHook, pytest-mypy +, pytest-runner, pytestCheckHook, pytest-mypy }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ colorama regex ]; checkInputs = [ pytestCheckHook pytest-mypy ]; diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix new file mode 100644 index 00000000000..c3878bf3c87 --- /dev/null +++ b/pkgs/development/python-modules/teletype/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "teletype"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02mg0qmdf7hljq6jw1hwaid3hvkf70dfxgrxmpqybaxrph5pfg1y"; + }; + + # no tests + doCheck = false; + pythonImportsCheck = [ "teletype" ]; + + meta = with lib; { + description = "A high-level cross platform tty library"; + homepage = "https://github.com/jkwill87/teletype"; + license = licenses.mit; + maintainers = with maintainers; [ urlordjames ]; + }; +} diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index b06a53cb333..8da8d622a7b 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytestcov, pytest-black, pytest-mypy +, pytest-flake8, pytest-cov, pytest-black, pytest-mypy }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytestcov pytest-black pytest-mypy + pytest-flake8 pytest-cov pytest-black pytest-mypy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index df1b0228304..0b21e17f96b 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0cc7d4r11z26rhcwpmcc42fi9kr3f20nq5pk84jrczr18i0g99mh"; + sha256 = "1bmj76gi8401lcqdaaznfmz9yf11myy1bzivqwwq08z3dwzxswck"; }; nativeBuildInputs = [ cython pkg-config ]; diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 791479b69e1..995a62230b2 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -4,7 +4,7 @@ , tox , pytest , coverage -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { tox pytest coverage - pytestcov + pytest-cov ]; checkPhase = '' diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index fb2c6094b37..20fad7c18a0 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , flit , pytestCheckHook -, pytestcov +, pytest-cov , numpy , scipy }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; }; - checkInputs = [ pytestCheckHook pytestcov numpy scipy ]; + checkInputs = [ pytestCheckHook pytest-cov numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 48aff396aaa..1cd055588c2 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ numba pytestCheckHook pytestcov ]; + checkInputs = [ numba pytestCheckHook pytest-cov ]; meta = with lib; { description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c0f76b084..05ca81772d8 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -6,8 +6,8 @@ , webencodings # Check inputs , pytest -, pytestrunner -, pytestcov +, pytest-runner +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index d8225e7031e..fb39831a0d1 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder, click , click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum -, ptable, pytestCheckHook, pytestcov, pytest-mock, requests, twine +, ptable, pytestCheckHook, pytest-cov, pytest-mock, requests, twine , validate-email }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pbr twine ]; - checkInputs = [ pbr pytestCheckHook pytestcov pytest-mock faker factory_boy ]; + checkInputs = [ pbr pytestCheckHook pytest-cov pytest-mock faker factory_boy ]; preCheck = '' export TOGGL_API_TOKEN=your_api_token diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index f1e90114ac6..508e38da450 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix new file mode 100644 index 00000000000..4204be03b94 --- /dev/null +++ b/pkgs/development/python-modules/tomli/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "tomli"; + version = "1.0.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = version; + sha256 = "sha256-ld0PsYnxVH3RbLG/NpvLDj9UhAe+QgwCQVXgGgqh8kE="; + }; + + nativeBuildInputs = [ flit-core ]; + + checkInputs = [ + pytestCheckHook + python-dateutil + ]; + + pythonImportsCheck = [ "tomli" ]; + + meta = with lib; { + description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; + homepage = "https://github.com/hukkin/tomli"; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index dbfad336d0f..2c289f85269 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , pytorch }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index b78f38c46cf..da5c4a9c3f5 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -5,7 +5,7 @@ , pyblake2 , readme_renderer , requests -, requests_toolbelt +, requests-toolbelt , setuptools-scm , tqdm , colorama @@ -30,7 +30,7 @@ buildPythonPackage rec { pyblake2 readme_renderer requests - requests_toolbelt + requests-toolbelt tqdm colorama rfc3986 diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 166e42ced82..cf3ec977d0e 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE="; + sha256 = "1s5q3gzd69syk8khlyy7ap8gpymvhgqrlv3vp6vdmwnaafjvvyy3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 61adcf9254f..5b7b17c8bb8 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -4,8 +4,8 @@ , click , pytestCheckHook , shellingham -, pytestcov -, pytest_xdist +, pytest-cov +, pytest-xdist , pytest-sugar , coverage , mypy @@ -26,8 +26,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov - pytest_xdist + pytest-cov + pytest-xdist pytest-sugar shellingham coverage diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index ef3b1c78c39..a4d8125b5d6 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , colorama , pytest -, pytestcov +, pytest-cov }: buildPythonPackage { @@ -19,7 +19,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index c278680404b..f7dcf33ea7f 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pytestCheckHook -, pytestcov +, pytest-cov , jinja2 , pyyaml }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; disabledTests = [ diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 32a87758234..4d7fe6b034b 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -7,7 +7,7 @@ , astunparse , typing-extensions , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { } )]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; # Tests must be run from outside the source directory diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index b43927c063e..c132f50dbea 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.5"; + version = "3.1.6"; src = fetchPypi { inherit pname version; - sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li"; + sha256 = "0b9y0v73ih142bygi66dxqx17j2x4dfvl7xnhmafj9yjmymbakbw"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index a9345b374a7..2055a481344 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , isPy27 , fetchPypi -, pytestrunner +, pytest-runner , setuptools-scm , singledispatch ? null , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner setuptools-scm ]; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 1dd80b52d19..cdd8ff02b97 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -6,7 +6,7 @@ , click , click-log , click-threading -, requests_toolbelt +, requests-toolbelt , requests , requests_oauthlib # required for google oauth sync , atomicwrites @@ -34,7 +34,7 @@ buildPythonPackage rec { click-threading requests requests_oauthlib # required for google oauth sync - requests_toolbelt + requests-toolbelt ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 82e291ae462..f13bd4cbdc4 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index 975e4098112..b6f8a407b23 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -5,26 +5,29 @@ }: buildPythonPackage rec { - version = "0.1.2"; + version = "1.0.1"; pname = "vultr"; src = fetchFromGitHub { - owner = "spry-group"; - repo = "python-vultr"; - rev = version; - sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; + owner = "spry-group"; + repo = "python-vultr"; + rev = "v${version}"; + sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests disabled. They fail because they try to access the network doCheck = false; + pythonImportsCheck = [ "vultr" ]; + meta = with lib; { description = "Vultr.com API Client"; homepage = "https://github.com/spry-group/python-vultr"; license = licenses.mit; maintainers = with maintainers; [ lihop ]; }; - } diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index a4bbee43d01..8da1cf55b54 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { patches = [ (fetchpatch { name = "fix-pip10-compat.patch"; - url = " https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch"; + url = "https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch"; sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c"; }) ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 8f946c47786..ecc13b1d637 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -13,10 +13,10 @@ fontconfig, lib, stdenv, pytest, - pytestrunner, + pytest-runner, pytest-isort, pytest-flake8, - pytestcov, + pytest-cov, isPy3k, substituteAll }: @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ]; + checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 21c9e352bf0..e70cdfd96c8 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -4,7 +4,7 @@ , future , pyjwt , requests -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { future pyjwt requests - requests_toolbelt + requests-toolbelt ]; # Tests require a Webex Teams test domain diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 6f06c8dba90..e38d43ef56b 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.6.0"; + version = "0.7.1"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk="; + sha256 = "02xrml9mpq3akwyryg1m7xjmgnlgi5kjvx7vkq6110ai0f9hzpwi"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index b078231c942..1272916d41f 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -9,7 +9,7 @@ , setuptools-scm , gcc , pytest -, pytestcov +, pytest-cov , isPy27 }: let @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython numpy scikit-learn six ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; # Checks require test data downloaded separately # See project source Makefile:test-data rule for reference diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 80f22efbda8..e04f17c214d 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -4,7 +4,7 @@ , numpy , pillow , cython -, pytestcov +, pytest-cov , pytest , fetchpatch }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy pillow ]; # Tests require extra dependencies - checkInputs = [ mock pytest pytestcov ]; + checkInputs = [ mock pytest pytest-cov ]; checkPhase = '' PATH=$out/bin:$PATH pytest test diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9837128a7fd..c975218e5b1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pypdf2 dict2xml weasyprint - ConfigArgParse + configargparse appdirs ]; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0aeb85e6ca2..66d219f9348 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , multidict -, pytestrunner +, pytest-runner , pytest , typing-extensions , idna @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ multidict idna ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 7c72d250034..16fb2777463 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,7 @@ , pythonOlder , pytz , requests -, requests_toolbelt +, requests-toolbelt , requests-file , requests-mock , xmlsec @@ -47,7 +47,7 @@ buildPythonPackage rec { lxml pytz requests - requests_toolbelt + requests-toolbelt requests-file xmlsec ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 313f121510e..fc869efe087 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,32 +1,41 @@ { stdenv , lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ifaddr +, pytest-asyncio , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.31.0"; + version = "0.32.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-U6GAJIRxxvgb0f/8vOA+2T19jq8QkFyRIaweqZbRmEQ="; + # no tests in pypi sdist + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "02fvh5ii73rf6pg9x93pc0sl1isx2ivg3d80l6s8h35w2f4g4azf"; }; - propagatedBuildInputs = [ ifaddr ]; - - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + ifaddr + ]; - pytestFlagsArray = [ "zeroconf/test.py" ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; disabledTests = [ - # disable tests that expect some sort of networking in the build container + # tests that require network interaction "test_close_multiple_times" "test_launch_and_close" + "test_launch_and_close_context_manager" "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" @@ -36,7 +45,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "zeroconf" ]; + pythonImportsCheck = [ + "zeroconf" + "zeroconf.asyncio" + ]; meta = with lib; { description = "Python implementation of multicast DNS service discovery"; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 37fbc87f3f7..89db9de12b7 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.58"; + version = "0.0.59"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-QU5ssbnT3/gioQ3vM9zvlbwxqSWyKIylsV9NuFkNe+Q="; + sha256 = "1x6s44apl393as847ghbqr26h0y0h4w3wp53bs0m2nfbzjwin3i7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 894539a3e2e..71f102f3667 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub +, fetchpatch , jsonschema , pyserial , pyserial-asyncio @@ -27,6 +28,14 @@ buildPythonPackage rec { sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln"; }; + patches = [ + (fetchpatch { + # Fixes tests/application/test_joining.py::test_new_device_join_and_bind_complex[FormedLaunchpadCC26X2R1] + url = "https://github.com/zigpy/zigpy-znp/commit/582cffb68fdf0c5bc14d55efca2a683222d7fed7.patch"; + sha256 = "0qsfziqqjnnf21gdqv3wwk50vni46i0h1liw5ysq641yjfnas9az"; + }) + ]; + propagatedBuildInputs = [ async-timeout coloredlogs diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index f03b9e96759..2778581566f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.33.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-oEf4GnvbQ6LY4NaNFWRmnNz1TK2tMpIVUxskhU38g4w="; + sha256 = "0y5sv8zzlkjwimknpld3fakl22cfkqv0cnw0immb7k4zb9xmls2v"; }; propagatedBuildInputs = [ @@ -40,6 +40,21 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited + "test_remigrate_forcibly_downgraded_v4" + # RuntimeError: Event loop is closed + "test_startup" + ]; + + pythonImportsCheck = [ + "zigpy.application" + "zigpy.config" + "zigpy.exceptions" + "zigpy.types" + "zigpy.zcl" + ]; + meta = with lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 61aee215031..f880d8fa7b7 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytestrunner ]; + checkInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8ac0958ffdd..f602f1b1813 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-NMqglKpVrGgkxnrxSKKUeQ9RZ3eamlO6CDlaHjwKA3I="; + sha256 = "sha256-tlnABN/mcUsR8tgqgrQT+t6joo6wJMeGKtcbjyiVbbE="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index af47f65d298..7800f4c1eda 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.48.7"; + version = "0.50.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I="; + sha256 = "0rklv9wj8gf95ar345k3ghpg9hxjpbsi693239wdfarzbsjrlcla"; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 9ffcbb172d4..1341017df05 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake -, pytestrunner, pytest, six, pyparsing, asn1ate }: +, pytest-runner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { pname = "asn2quickder"; @@ -19,7 +19,7 @@ buildPythonApplication rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ makeWrapper cmake ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; propagatedBuildInputs = [ pyparsing asn1ate six ]; diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix index 66177d3a34f..3f31b921831 100644 --- a/pkgs/development/tools/async-profiler/default.nix +++ b/pkgs/development/tools/async-profiler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "async-profiler"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738="; + sha256 = "sha256-MtRO0tbo4kDHcQmir8ulv0q1Qh+KnKIshb1NDtu1SKg="; }; buildInputs = [ jdk8 ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 22636b588b7..d2de1bcc063 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G2cHKhgsv1fj7eKbADER3R2uXp9DnKevboE7vnO5pDE="; + sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8="; }; vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU="; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 3b2c8ac2ce5..2de586f97cb 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "3.19.7"; src = fetchurl { - url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; + url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4="; }; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4682fab41db..27a21619c1d 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { - url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o="; + url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; + sha256 = "sha256-HIT7bxMEz7jpSsYvohN9+zYuyCf/ARE7hd48YMTo9/4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; + # this is mostly downloading a pre-built artifact + preferLocal = true; + installPhase = '' runHook preInstall install -Dm555 "$src" "$out/bin/.mill-wrapped" @@ -25,6 +28,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + # The default release is a script which will do an impure download + # just ensure that the application can run without network + installCheckPhase = '' + $out/bin/mill --help > /dev/null + ''; + meta = with lib; { homepage = "https://www.lihaoyi.com/mill"; license = licenses.mit; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index d2d382f28d3..280173dc0c0 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtscript ]; - enableParallelBuilding = true; - meta = with lib; { description = "A tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 1c5f316cea9..f9e7d215f32 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, emacs }: +{ lib, stdenv, python3, emacs, bash }: stdenv.mkDerivation rec { pname = "cask"; @@ -13,15 +13,19 @@ stdenv.mkDerivation rec { noflet ert-async shell-split-string git package-build ] ++ [ python3 + bash ]; strictDeps = true; buildPhase = '' + runHook preBuild emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/templates mkdir -p $out/share/emacs/site-lisp/cask/bin @@ -30,6 +34,7 @@ stdenv.mkDerivation rec { install -Dm644 templates/* $out/templates/ touch $out/.no-upgrade ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 8de2bc1aeed..8d36c899082 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { colorama future requests - requests_toolbelt + requests-toolbelt semver simplejson six diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a8d35a44bb9..b32eed9a166 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.30.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-U2UnT41IpICy08jPQkr25wjAL1kBxiQCD4lysYnLAPk="; + sha256 = "sha256-Rot5A2zSEleTifadHEvAlydchzCdDo/VPZELostDfng="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b03dcc89d44..e2d40630905 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -20,7 +20,7 @@ }: let pname = "github-actions-runner"; - version = "2.278.0"; + version = "2.279.0"; deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map @@ -41,6 +41,10 @@ let # Online tests (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ + "CompositeActionWithActionfile_CompositeContainerNested" + "CompositeActionWithActionfile_CompositePrestepNested" + "CompositeActionWithActionfile_MaxLimit" + "CompositeActionWithActionfile_Node" "DownloadActionFromGraph" "DownloadActionFromGraph_Legacy" "NotPullOrBuildImagesMultipleTimes" @@ -80,8 +84,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version} - sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c="; + rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} + sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; }; nativeBuildInputs = [ @@ -123,6 +127,11 @@ stdenv.mkDerivation rec { --replace 'dotnet test Test/Test.csproj' \ "dotnet test Test/Test.csproj --filter '${testFilterXml}'" + # We don't use a Git checkout + substituteInPlace src/dir.proj \ + --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \ + 'echo Patched out.' + # Fix FHS path substituteInPlace src/Test/L0/Util/IOUtilL0.cs \ --replace '/bin/ln' '${coreutils}/bin/ln' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e89c784df74..ff5799df4ac 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 = "14.0.1"; + version = "14.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "1i1fddsz7cr0kg4bxqisx29cwyd07zqfbpmh5mhvi5zqy0gfmcn8"; + sha256 = "09p0biig07plf9qiwpsdllh6midi8kzpzk2s71rmms491g4634k2"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "1d2ywc3cikffiwpql2kp5zg21vjinz51f76c6wdn0v35wl705fz4"; + sha256 = "0z5q5y9lsznwglpg7sd5af51v9640m85v4x4dcj5j37w24bi4wq0"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1prvmppq5w897bd9ch5z0h6h8mndy6myv8al24cr0bjc27c6wyn7"; + sha256 = "1v2yxs92awwn4m6hq6wc53whfmk6fr4l6j87amcbdzcm4ikzxcvk"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 2e361076ae4..ef95263185c 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -79,6 +79,6 @@ in homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont ma27 ]; + maintainers = with maintainers; [ ardumont ]; }; } diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 12e5c8c14ab..6578bf8bf71 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.0"; + version = "0.6.1"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY="; + sha256 = "0p5vjpfmy52hbq6mz8svvxrg9757cvgj0cbvaa0340309953ilvj"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9a0d19840e4..57f30ec3ae4 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.6.1"; + version = "1.7.0"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw="; + sha256 = "sha256-RfBDeBuI/Yk24Q2jX/Re7fvx1bhYWJjqLhRkNHCaM9k="; }; subPackages = [ "cmd/dlv" ]; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index b46a97df20a..e806b502de8 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.17"; + version = "0.5.18"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE="; + sha256 = "sha256-YY4scGRMuvyEpeEgvoJJsTtROl11hMyGr7vYBYvJY/w="; }; - vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY="; + vendorSha256 = "sha256-aDkaOycQ/wPybSH5fnJIGtCOh+KV0wEF+qinRQQIdm4="; buildFlagsArray = '' -ldflags= diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 2cc5e6b7ca5..af851e25211 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,19 +4,19 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.9"; + version = "2.0.3"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "098dcg8jdi4q1prfjmd2lbhcyzb8fmmfhbxhid4kqx8vcv7r0iql"; + sha256 = "sha256-/tX45t/DsWd0/R9VJJsqNjoOkgGIvqvq05YaVp0pLf0="; }; - patchPhase = '' + postPatch = '' substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" - substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules" + substituteInPlace setup.py --replace "pyasn1-modules >= 0.2.1, < 0.3" "pyasn1-modules" ''; preConfigure = '' @@ -47,11 +47,14 @@ python.pkgs.buildPythonApplication rec { qrcode requests ruamel_yaml + yamllint ]; # no tests doCheck = false; + pythonImportsCheck = [ "fdroidserver" ]; + meta = with lib; { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 0b1e8d16b65..c20993fbea9 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.5"; + version = "3.14.6"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM="; + sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0="; + vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix new file mode 100644 index 00000000000..4754a32db82 --- /dev/null +++ b/pkgs/development/tools/ko/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "ko"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc="; + }; + + vendorSha256 = null; + excludedPackages = "test"; + checkInputs = [ git ]; + preCheck = '' + git init + ''; + + meta = with lib; { + description = "A simple, fast container image builder for Go applications."; + homepage = "https://github.com/google/ko"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index c563d9bef09..5c86b9a2406 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-uNlKxcU1iCR4JzNfBatEeKMMdu9ZqvOqna0sGrcwK30="; + sha256 = "sha256-jv5IhTxusB74pnpoopl+fKnXDJI/65D8PSuhGVgbDyo="; }; - cargoSha256 = "sha256-4Xo17HlYvJLf90R0gS9EFJSJKmNHClXqAJTx9mY29KA="; + cargoSha256 = "sha256-6SaW3wqhn251GaH3GRNaSqRLnbQimDBRSt+RPgJG1M8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index ef7dcb35321..3be33656431 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -16,7 +16,6 @@ mkDerivation rec { sourceRoot = "source/MiniZincIDE"; - enableParallelBuilding = true; dontWrapQtApps = true; postInstall = '' diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index fe43da91b54..8c43fe7f594 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/pkgs/development/tools/misc/go-md2man/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "go-md2man"; - version = "2.0.0"; + version = "2.0.1"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; + sha256 = "sha256-DnXWnHWtczNnLaQg9Wnp9U/K4h/FbhqGgba44P6VNBQ="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 4da1a2cba09..b3722965fdc 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.12"; + version = "5.13"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q="; + sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 6f02e934394..cc5f6f72a4c 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rRSBPnvv4941IUGN/6+8/hzgYDqgPErNkd7tFrslPiQ="; + sha256 = "119rbjg3lsm73mdw6ymvslyj4y4ghj3a3dvxnvkrm55v9g0s03l9"; }; - vendorSha256 = "sha256-sN9GTcG5cZxvMaLqNjY2jfLkf8a3lugM2aV3bBdT5Ww="; + vendorSha256 = "1fvp53d694a4aj8l4hj7q2lvyadn9y9c52q4bzl6yrfjq6708y8d"; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; homepage = "https://github.com/cycloidio/terracognita"; - changelog = "https://github.com/cycloidio/terracognita/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index f48c6f9e0b6..86afbcc9421 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q97N9I1EzpcFlMuHe3X5rfZHt6XTytYO1inpGEvv1IQ="; + sha256 = "sha256-ag8Dq3lhLoKE4rgrnWLHtKRHEnw/ytyXI+pRt5CgZJI="; }; - vendorSha256 = "sha256-7XcAt0+slNIjxxf7pUl7XO/PAN2z8WmzTuI0FsjgrBM="; + vendorSha256 = "sha256-/lpjlThr6HPkuJ6om9ifBsdsh0x4kVXM6PAonk7GJCY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index c4b0546ec36..c48cf727d20 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA="; + sha256 = "sha256-VNOq9uhtzf1hdEn+bkAOYy4gZxP5ek0WaaS/71uJzrA="; }; - vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY="; + vendorSha256 = "sha256-WYA/wZJg93+X4IAX9hOMRHVRQRyA4N4aDaScDgkGUIE="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 3d0db49aedc..448e7dd4406 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -75,8 +75,6 @@ in stdenv.mkDerivation rec { __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; - enableParallelBuilding = true; - dontWrapQtApps = true; installPhase = '' diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 78751385577..58a634ee86c 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -499,7 +499,7 @@ self: super: old: { inherit (pkgs.python3Packages.jira) patches; buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner + self.pytest-runner self.cryptography self.pyjwt ]; @@ -1269,8 +1269,6 @@ self: super: } ); - pytest-runner = super.pytest-runner or super.pytestrunner; - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { buildInputs = [ self.pytest-runner ]; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 14518939dcd..483a85db02a 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.58.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-9XVvdAt/TWQdCY8s//QHZC6THFAf+pMYQpjHjUR3wrc="; + sha256 = "sha256-hrWSieWeVAg28f3Fh9mElr+mDh4v4T5JI1c3+Hrm7c0="; }; - vendorSha256 = "sha256-m6eQ843aP68TO4W5Nq4zKqcf2wgdH/7Srzt37t/NSdk="; + vendorSha256 = "sha256-h4YUQWmFYouEvHup8Pu6OqfHf1EoPszVFzklU9SbJZQ="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 2b0227407da..5926b3fda5e 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -45,8 +45,6 @@ mkDerivation rec { doCheck = true; - enableParallelBuilding = true; - buildFlags = optional withDocumentation "docs"; installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 017fb7d484d..c7cdf92dcd8 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.8.0"; + version = "7.8.1"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZbVBwSg3roIMA+5LVP3omtTgbAJ7HAdJDXyAybWuRLw="; + sha256 = "sha256-g6k/7jo8pvTn5snU05uSGzprNMt8/x+bJsLb/y0jHRg="; }; - cargoSha256 = "sha256-6aoi/CLla/yKa5RuVgn8RJ9AK1j1wtZeBn+6tpXrJvA="; + cargoSha256 = "sha256-pfjWTkDw4D7eMADkPX01vapka8I6o0ZvkNjQt5X2pUk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 568b9e1e1dd..284ce6d817a 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -27,8 +27,6 @@ let outputs = [ "bin" "man" "doc" "out" ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; - buildPhase = '' pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1 ''; diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index 2e1ca55dad3..93650c9027a 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index fcab1f952f2..a6d28b36bff 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 811a63b0cef..ff673658272 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.7.0"; + version = "8.0.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; + sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z"; }; # don't remove runtime deps diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index f6cd67d70bc..d1a6330df7b 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-heri1vb0KykEqef8uBfEazPzTgz8jjYSUB0dpPiDJ7g="; + sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ="; }; - cargoSha256 = "sha256-v/yafzfAy1SBjeFwaMEWVTGJH3Fv1CYYU70TA7AUUsk="; + cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 3c61121b035..8828b0222cc 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.228"; + version = "0.0.229"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw="; + sha256 = "sha256-mw+rTMFj41+T6lDe/MOQpmRcjt/gJhOCfaHcBkpjcsg="; }; preBuild = '' diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 09f92b0f848..26b29b9228e 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -43,6 +43,14 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { exec ${unpacked}/bin/anki ''; + extraInstallCommands = '' + mkdir -p $out/share + cp -R ${unpacked}/share/applications \ + ${unpacked}/share/man \ + ${unpacked}/share/pixmaps \ + $out/share/ + ''; + inherit meta; }) else stdenv.mkDerivation { inherit pname version; diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 30abb71a129..c34c9efb167 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-qbMR7otsC+uz+9mwgFaD2Z5fC6rj8ueYG3KwpPiqL98="; + sha256 = "sha256-7wNiDA/gOpqzSFWw8Bn6suC/f5RXdDTxPV49nCvOxas="; }; postPatch = '' diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 98c58191f16..500181ff70e 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.36" }, "stable": { - "name": "factorio_alpha_x64-1.1.35.tar.xz", + "name": "factorio_alpha_x64-1.1.36.tar.xz", "needsAuth": true, - "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", + "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", + "version": "1.1.36" } }, "demo": { @@ -28,12 +28,12 @@ "version": "1.1.35" }, "stable": { - "name": "factorio_demo_x64-1.1.35.tar.xz", + "name": "factorio_demo_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", + "sha256": "15fl4pza7n107rrmmdm26kkc12fnrmpn6rjb4ampgzqzn1fq854s", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/demo/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/demo/linux64", + "version": "1.1.36" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.36" }, "stable": { - "name": "factorio_headless_x64-1.1.35.tar.xz", + "name": "factorio_headless_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", + "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/headless/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/headless/linux64", + "version": "1.1.36" } } } diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 9f7d1684a5c..c150ba4ffee 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.8"; + version="6.2.9"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="0irqb0wl30c2i1rs8f6mm1c89l7l9nxxv7533lr408h1m36lc16m"; + sha256="sha256-3fzCC911aQCpq2xCx9r5CiiTv38ZzjR0IM42uuvEGJA="; }; buildInputs = [ flex diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 1cb27f7b8c5..586d93151e2 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "3.12.5"; + version = "3.40.14"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "1xgxyfwwghy9l17i6y40axdrpp4fgxgdr5y97flwmfivif01ifs1"; + sha256 = "1bmkkmi1gx5kc39cjnz5bzwqaicxs0zb6bcv4iny9qccbqf3icrd"; }; nativeBuildInputs = [ diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e210efade03..9e79a9005dc 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,13 +5,13 @@ }: let - version = "0.3.3"; + version = "0.3.4"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76"; + sha256 = "051dm7bw3l8qnppk5b7xvavl29xfadqn8aa18q49qdy5mjy6qgk4"; }; objects-src = fetchFromGitHub { @@ -29,8 +29,8 @@ let }; in stdenv.mkDerivation { - inherit version; pname = "openrct2"; + inherit version; src = openrct2-src; @@ -58,22 +58,22 @@ stdenv.mkDerivation { zlib ]; - postUnpack = '' - cp -r ${objects-src} $sourceRoot/data/object - cp -r ${title-sequences-src} $sourceRoot/data/sequence - ''; - cmakeFlags = [ "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; + postUnpack = '' + cp -r ${objects-src} $sourceRoot/data/object + cp -r ${title-sequences-src} $sourceRoot/data/sequence + ''; + preFixup = "ln -s $out/share/openrct2 $out/bin/data"; meta = with lib; { - description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; + description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; homepage = "https://openrct2.io/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ oxzi ]; }; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index d4ae6046f1c..55f9bfb75c3 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.707.0"; + version = "2021.720.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k="; + sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 4684d79d95c..d2c19b08d03 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -26,8 +26,8 @@ }) (fetchNuGet { name = "Fody"; - version = "6.5.1"; - sha256 = "08zpyrniajjba5isjb09spggfh0af2z6x4h2zy5ilk3y5bb9vdch"; + version = "6.5.2"; + sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f"; }) (fetchNuGet { name = "HidSharpCore"; @@ -781,13 +781,13 @@ }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; - version = "2021.706.0"; - sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556"; + version = "2021.716.0"; + sha256 = "0w45af0mlh4bkjxxhk5p4kb6z0na8fmm6xz10dfzs3b4i61h5x3z"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.707.0"; - sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna"; + version = "2021.714.0"; + sha256 = "175i0hcbl01xy633zvij8185nj4g7ja1rsv2lmfz8qdykqj6g9kl"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -816,13 +816,13 @@ }) (fetchNuGet { name = "Realm"; - version = "10.2.1"; - sha256 = "14pi7vz7nl8ag0bmlbyds52z5nx9wbg154qkm6jai10rm02ws86l"; + version = "10.3.0"; + sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v"; }) (fetchNuGet { name = "Realm.Fody"; - version = "10.2.1"; - sha256 = "1zv57wb7zcgyigsxqikf2yq2h7an4c3dbydl9la5xdpa76dgmxdi"; + version = "10.3.0"; + sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d"; }) (fetchNuGet { name = "Remotion.Linq"; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 349dd5d85cb..1c9879f8beb 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -61,8 +61,6 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index ea8c8aaeac8..cc28ebc63f3 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -43,6 +43,4 @@ mkDerivation { ''; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtmultimedia qttranslations ]; - enableParallelBuilding = true; - } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index fc2654fd8e9..60b2bc5faf7 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -11,28 +11,28 @@ let else map (name: pakSpec.${name}) (splitString " " paksets) ); - ver1 = "120"; - ver2 = "4"; - ver3 = "1"; - version = "${ver1}.${ver2}.${ver3}"; - ver_dash = "${ver1}-${ver2}-${ver3}"; + ver1 = "121"; + ver2 = "0"; + ver3 = ""; + version = "${ver1}.${ver2}${lib.optionalString (ver3 != "") ".${ver3}"}"; + ver_dash = "${ver1}-${ver2}${lib.optionalString (ver3 != "") "-${ver3}"}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; - sha256 = "0yw7vjvmczp022mgk35swwhpbiszpz91mwsgicxglwivgc30vvic"; + sha256 = "1f463r6kr5ig0zd3mncc74k93xbjywsq3d06j5r17831jyc9bzb9"; }; - # As of 2015/03, many packsets still didn't have a release for version 120. + # As of 2021/07, many of these paksets have not been updated for years, so are on old versions. pakSpec = lib.mapAttrs (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { - srcPath = "121-0/simupak64-121-0"; + srcPath = "${ver_dash}/simupak64-${ver_dash}"; sha256 = "1k335kh8dhm1hdn5iwn3sdgnrlpk0rqxmmgqgqcwsi09cmw45m5c"; }; "pak64.japan" = { - # No release for 120.2 yet! + # No release for 121.0 yet! srcPath = "120-0/simupak64.japan-120-0-1"; sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i"; }; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index ba232097af6..8857e3868b5 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - enableParallelBuilding = true; - meta = with lib; { description = "A free 2D physics sandbox game"; homepage = "http://powdertoy.co.uk/"; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index afeded792f2..246e1afc744 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,34 +1,65 @@ -{ lib, stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg -, libpng, freeglut, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_net -, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, makeWrapper, bzip2 +, curl, libjpeg, libxml2, xz, lua, ode, libGL, libpng, SDL, SDL_mixer, SDL_net +, SDL_ttf, sqlite, libxdg_basedir, zlib }: stdenv.mkDerivation rec { pname = "xmoto"; - version = "0.5.11"; + version = "0.6.1"; - src = fetchurl { - url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n"; }; - buildInputs = [ - chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut libGLU libGL SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode libxdg_basedir libxml2 + patches = [ + # Fix build with Nix + (fetchpatch { + url = "https://github.com/xmoto/xmoto/commit/536dcc7ec77a4c4c454b86220e85b1cb3cd1c7f7.patch"; + sha256 = "0h9lld668jrbmrqva89zqwp63jiagjj86prkxzx6372p3kk9y7g7"; + }) ]; - CXXFLAGS = [ - "-fpermissive" - # Build using the old C++ ABI to fix issue with missing text; the issue - # should be fixed in the next stable release (if that ever does happen) - "-D_GLIBCXX_USE_CXX11_ABI=0" + nativeBuildInputs = [ + cmake + gettext + makeWrapper ]; + buildInputs = [ + bzip2 + curl + libjpeg + libxml2 + xz + lua + ode + libGL + libpng + SDL + SDL_mixer + SDL_net + SDL_ttf + sqlite + libxdg_basedir + zlib + ]; + + preFixup = '' + wrapProgram "$out/bin/xmoto" \ + --prefix XDG_DATA_DIRS : "$out/share/" + ''; + meta = with lib; { - description = "Obstacled race game"; + description = "A challenging 2D motocross platform game, where physics play an important role"; + longDescription = '' + X-Moto is a challenging 2D motocross platform game, where physics plays an all important role in the gameplay. + You need to control your bike to its limits, if you want to have a chance to finish the most difficult challenges. + ''; homepage = "http://xmoto.tuxfamily.org"; maintainers = with maintainers; [ raskin pSub ]; - platforms = platforms.linux; - license = licenses.gpl2; + platforms = platforms.all; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index c9baefcf0af..e38dedbb7f7 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp"; }; - phases = [ "unpackPhase" "buildPhase" ]; - buildPhase = '' mkdir -p $out cp sqlite3.c $out/ diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index b5a385ab407..d6fead938a4 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ - ConfigArgParse + configargparse ]); postConfigure = '' diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index c766df9e3c0..f2817bde85c 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -12,8 +12,6 @@ mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtdeclarative ]; diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix index c0bf7a223a3..d3ad2f68199 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/misc/emulators/punes/default.nix @@ -12,18 +12,20 @@ , ffmpeg , libGLU , alsa-lib +, libX11 +, libXrandr , sndio }: mkDerivation rec { pname = "punes"; - version = "unstable-2021-06-05"; + version = "unstable-2021-07-19"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "07fd123f62b2d075894a0cc966124db7b427b791"; - sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l"; + rev = "15ab85dabb220889419df0c249c06f3db2b09dc0"; + sha256 = "1w0c5lfdl9ha4sxxva6hcpcaa444px6x25471q37l69n71rmjpy8"; }; postPatch = '' @@ -34,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ] ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; dontUseCmakeConfigure = true; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 1bac8b0fe0c..6a8786be6ea 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 60d6545ae5f..b4978e200ab 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -127,12 +127,12 @@ in rec { dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; rev = "v${version}"; - sha256 = "sha256-hq+sKA/EkiKia/31SY1zYPz/bxLuwm6sSrGlip1DULw="; + sha256 = "ILs+GMltb2AYNUecFMyQZ/AuETB0PCFF2InSnptVBos="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e6dd49198c9..b31924a9de4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2"; - sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4"; + rev = "5ad4fdd583116ec253aaf43e2d457cd3e3aa5587"; + sha256 = "178c60ckgkr4ivgi1b21f1cndx9d64spydc8z75gcyz3r6lcbrmm"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-05-31"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "4ca3d418eebc0da452b7defc18970c83f7de5070"; - sha256 = "0ax3hfwppbkm7haxvsllac6r4zk2ys9rrj7sj4p3ayl1w8v3n8nq"; + rev = "c15c4e49d6ecb7ad7252902bb1b4310ba161617a"; + sha256 = "13pnlx4rqjc51vrq9d8kyjjxb2apw3y6j2xh68ii746klinjpjy5"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-18"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "384925e0cfa87a27387357cab144fbf392e21f61"; - sha256 = "01bg8h7276nidrgdgz6asvksi3m0g6jf8aw9bp0d4ng6s0gdfps2"; + rev = "f768ee24fd8b8b3ee6751361b9ac09f7c8f381d8"; + sha256 = "1rdfjz2l2v1hzsp8pfiv0c7kbmf7221a90pak7w7mncaabrzlnxr"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-17"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "75b97dfdd641d530b86dee603308aea0079736e9"; - sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2"; + rev = "d3ddb34d124c2fce9afa56342e67732a267d6b42"; + sha256 = "1px4fny0m272jl4vvhhv317j4wh5kfb89rdlrrpqwg8dl2si24rq"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -569,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-16"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a"; - sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in"; + rev = "576f3c972aa9c4458d3dbac2794bd8643ae16e4a"; + sha256 = "09cndvz8dcasn35bclhqc4i72dw93sczivvfi0zw9ncgsdl22r6g"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -690,12 +690,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd"; - sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g"; + rev = "82d2139de0279a20a70da61320042adf31b94798"; + sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -786,12 +786,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-06-13"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "b55e4906a10db0f6917058aec6616075c4d06994"; - sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm"; + rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d"; + sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -822,12 +822,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-30"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17"; - sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861"; + rev = "2cad943df739c1fcf4d923854ae642fde38b477f"; + sha256 = "1j761zpa41p9hmh4bxapaqjvxx9d3nhcf2bifsibcjghcxblj1xb"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1316,12 +1316,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-07-04"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "1936824f5986c986befad5995e7bf87ba124d109"; - sha256 = "16h82yn7g9jq2chdb4wjjvz6akb0r06wjjvqpj9xkp82rx55m4ix"; + rev = "63d7052686732a910b7355761193fdb55a521cd3"; + sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1388,24 +1388,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-12"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "0aad4037902271c8c85d00d02e77f79ec2141267"; - sha256 = "0knxkcf8ndj6ggcj8jsfgcmm98pmshl1n05qrixkhgh4ilrisqr4"; + rev = "8785d0c2737b6354c847a2ac2cd327a16e2087f2"; + sha256 = "0nhf9vnsba7gm1yxnbj8lqd9d1ihdgpqrlyihlc815ayqzzs3h9b"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2021-04-04"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "f305bc77faef4b418aee65682d7d147f64cfd5a9"; - sha256 = "1yr8jni3z9sf348d8zw532vj4s1ww62yfslfcdgkgwhba1l2vy53"; + rev = "1c4f781f2439469e5342217131886260c9445fc6"; + sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1619,12 +1619,12 @@ final: prev: floating-nvim = buildVimPluginFrom2Nix { pname = "floating-nvim"; - version = "2021-05-08"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "fhill2"; repo = "floating.nvim"; - rev = "c47af010aa8e88758995858f0ed2771a99cd3e98"; - sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50"; + rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb"; + sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj"; }; meta.homepage = "https://github.com/fhill2/floating.nvim/"; }; @@ -1713,6 +1713,18 @@ final: prev: meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; }; + fzf-checkout-vim = buildVimPluginFrom2Nix { + name = "fzf-checkout.vim"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "stsewd"; + repo = "fzf-checkout.vim"; + rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; + sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; + }; + meta.homepage = "https://github.com/stsewd/fzf-checkout.vim"; + }; + fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; version = "2021-06-20"; @@ -1859,12 +1871,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-16"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f29e8a461e05881c69953b41784a1aeb4b70a422"; - sha256 = "1nda02nd9v17yv6fawidg8c3haijysb9zc04sjy0v708h2nw8qhj"; + rev = "c3b63ec2ffedc7e7199265852eab13ec8c02b6e0"; + sha256 = "1l8yilf0fqi16lrgpp8i8irq3fb1a73j17gvhff7m6fyzilwahjj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2195,12 +2207,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-07-03"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "17a83ea765831cb0cc64f768b8c3f43479b90bbe"; - sha256 = "155da638i4ff1wsy5600jgrqicykb27lxq9liag174nga6xazbn6"; + rev = "0257caac96b28ec9efd80a00c13d31c469357f5b"; + sha256 = "0r5c99xzsizqpk4h35lp3ip8lqang2vvg01vrv0bad3wqnjqq1d7"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2436,12 +2448,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-07-14"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd"; - sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv"; + rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99"; + sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2676,12 +2688,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-17"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "29e685953d362c723c55417eea2b795b5bcc2ef5"; - sha256 = "183511fy34sazpkaxcpr250id4zyxhs5mqws49b516sh0d875fjj"; + rev = "78af1399d0e7a85152d4f75b9ce0c20286735d6e"; + sha256 = "156wdb57vabz0syx84zlnn5v6wy7g02flq4r5caz9xwccdszwz33"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2724,12 +2736,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-12"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980"; - sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89"; + rev = "d4ddebdb4f4bc44e731e808d794bd8c429dc9e07"; + sha256 = "01lsxak9hl2shhhzqjypdjpkasrppn6v8xlzxi28c7973c5jn629"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -2820,12 +2832,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-07-16"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961"; - sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j"; + rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61"; + sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3132,12 +3144,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-06-30"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "3fdfd45119be64945e635bf2406fdb0430cb85df"; - sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4"; + rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0"; + sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3408,12 +3420,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-17"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc"; - sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085"; + rev = "994cb6b4efa481ac1a64aa3ac5c9e8cfea806783"; + sha256 = "1wssns3iwgfkf73vgln4msv8l5gw724wyalqzv8w8ckhf68dbz4j"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3444,12 +3456,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-14"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e"; - sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr"; + rev = "fa50b4ce297599dc22b1b4bb8550eff4d791f9e4"; + sha256 = "0fhp6qxwykb1hz4xgaj4sq1h1qlfdr855fyaigw171nz0p7ki7ws"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3492,12 +3504,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-14"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d"; - sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc"; + rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066"; + sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3540,12 +3552,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329"; - sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s"; + rev = "47fc74b5b3aafd2e3028c69ab96cb215c5f6c8bc"; + sha256 = "0mr0dh8picgd8ghm9gvgyg08cihr4k1x8l2brfahpnxha6aghx58"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3600,12 +3612,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-14"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6"; - sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c"; + rev = "e3e23d257c9a36e3d189d6b57e6c6b7e91bfa14f"; + sha256 = "09rk3s6swwng78cpj1f2rlww2vkqai9sx72sqihk09sc16prp6cc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3648,12 +3660,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-07-06"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "85c931fa18cb9a7c54b0a6bde54924741bdb296c"; - sha256 = "0fw59qgfaskwv8k8pjq1xb8b4k55rgr04311xma4arki9gjrv128"; + rev = "8e1d114f3d855653bc71fba9e5a22a05d3a1b1a2"; + sha256 = "1dm6rwx3w8hbgg20ay4bcdd3c87bqpqvl64zfc673p81m76b3s86"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3708,12 +3720,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-17"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "1729b502fa00df2fdcbfa118b404b8b8a8a2d6a3"; - sha256 = "1r4ajaxvf9kpfq42b81c08ixfqakiq8fibn89qar7sd4a7634dsg"; + rev = "4f72377143fc0961391fb0e42e751b9f677fca4e"; + sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3756,12 +3768,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-07-07"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "2216837c0178dc81cca3d47aff9699ac1b2aec8e"; - sha256 = "0n1p7abd08k28c30pzk51vm1j3wghyjxbw0c8j0jwxiyzaf3p865"; + rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96"; + sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3780,11 +3792,11 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-12"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "96af0fa98252ab3543ff1464c6452930f242c615"; + rev = "0e11e0322c1730559cb74f728300de2912bf9a61"; sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; @@ -3792,24 +3804,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-07-10"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "f178c8c8c5cb994326578a24d3296dde6f2e9bd3"; - sha256 = "1xdakhjsjfx7y3dqi99ldgwmh69jyyvisqainlkiz63g0nsy81ay"; + rev = "d3e76b81e5b169af192dea4da0bd6f64faad2c36"; + sha256 = "0hw50yyikndx1260a50j6izjsa4m709r7v3qzrpwz482d7fq700j"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-18"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9144ea1107ed5aaf250bffafc1f0f32fb97cce47"; - sha256 = "05apxyy0xg6llskigirglb4a73ay8cdaw2rckl2g3d6j8ry9dkc4"; + rev = "e473630fe0872cb0ed97cd7085e724aa58bc1c84"; + sha256 = "1l6cv9znpwnk4hmg3vh8gy26s8hvlbg03wmd7snjwxcpfyj6vi84"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3852,24 +3864,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-07-08"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "379bc8f48256c07139241e1c7a70f22dd4344c4f"; - sha256 = "0bmy6rzmh3jfqd567wiavwfm9j2dpb0asmcgkyvj5j5qy2xfmi5l"; + rev = "7f36db566c66998e04ea569723174c42d8190903"; + sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "4887eb7526004e069bd8898041a714c7eaad72e7"; - sha256 = "1abdjkiyyzgaw3lskjfb0lcilkp8qqlaqj8kyfmzf4w4mz9ijh4d"; + rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c"; + sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4465,12 +4477,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0"; - sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k"; + rev = "11f232c7a82c3fd5d34654c6b02abae4f56ac5e6"; + sha256 = "1xyrf6s8szd1lpz70ng1whhysjvnn7pxi80knyrjrkqzkqpimiac"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4694,12 +4706,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-12"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "ef631befe2bea01c23f4f0d9685025ac15d51ace"; - sha256 = "1hk1f1mbk37gcqhrwvn352q83qsf5nrgyrgghvkj8m91jgf4m31y"; + rev = "9d8c57c2b0bf57082093bf1b162ac492206d35dd"; + sha256 = "0ymgbcy8v7ang4ghlkr52wq86ydr4pma1vwvp78y5yhi4xmn82mn"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4815,24 +4827,24 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-07-17"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "76277236829ca77dd41d285c794ab8878129e3f8"; - sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81"; + rev = "9983108bc9941af842d3b847b60564d180fc8e4b"; + sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-06-01"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "93711180123b9ba6958bfc682d305ef0a1056fa5"; - sha256 = "1i3hhihlvh5mkn1vl9f1baiz712h8lwp1hfi5arsb36picsmgbfd"; + rev = "d313ed0f8f39a7fd09da65c4f02191368680387f"; + sha256 = "1z9r2x58g212jy2sl981s7f8pj2nbqfgjbfi471yqafbxlynfzdw"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4863,12 +4875,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda-vim"; - version = "2021-02-20"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "fbb138f5090c3db4dabeba15326397a09df6b73b"; - sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf"; + rev = "bfafa2722178bdb8898e014a7e95b60d497960d9"; + sha256 = "1cjj6d6zkd2b9hv77saz8p7xcw06rj0svdhycc4df8bcdrvvmi39"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -4921,14 +4933,26 @@ final: prev: meta.homepage = "https://github.com/keith/swift.vim/"; }; + symbols-outline-nvim = buildVimPluginFrom2Nix { + pname = "symbols-outline-nvim"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "simrat39"; + repo = "symbols-outline.nvim"; + rev = "7414f30365a342e1d89072d474a35913643b6eec"; + sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; + }; + meta.homepage = "https://github.com/simrat39/symbols-outline.nvim"; + }; + syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-07-01"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "c89741ef310fd0a380ffb80b80e10f197afd6224"; - sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh"; + rev = "7414f30365a342e1d89072d474a35913643b6eec"; + sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -4958,6 +4982,18 @@ final: prev: meta.homepage = "https://github.com/codota/tabnine-vim/"; }; + taboo-vim = buildVimPluginFrom2Nix { + pname = "taboo-vim"; + version = "2019-08-27"; + src = fetchFromGitHub { + owner = "gcmt"; + repo = "taboo.vim"; + rev = "caf948187694d3f1374913d36f947b3f9fa1c22f"; + sha256 = "06pizdnb3gr4pf5hrm3yfzkz99y9bi2vwqm85xknzgdvl1lisj99"; + }; + meta.homepage = "https://github.com/gcmt/taboo.vim/"; + }; + tabpagebuffer-vim = buildVimPluginFrom2Nix { pname = "tabpagebuffer-vim"; version = "2014-09-30"; @@ -5117,24 +5153,24 @@ final: prev: telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z-nvim"; - version = "2021-07-17"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "27694fa19bc00cc24b436d671951f516a4a966a1"; - sha256 = "0g12nfmv2hllw0ylsy362mp1gyaf4ldyiza3jg74c66xwi2jj8i9"; + rev = "f5776dbd0c687af0862b2e4ee83c62c5f4a7271d"; + sha256 = "08lcszv53d9mqhgdwkdygbnk5w0pyh0q6djxzqhnjb6qphibf3m6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-18"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "8c3f2b630be0241fe10709e61ee9dab473518f32"; - sha256 = "1yd1kkdp8baxrhkfsg0j0dpkprxvwi0r4xljjcdln7rpr2r0lm82"; + rev = "664690029fdb302bee8d3f27a458383e8477add7"; + sha256 = "1aaq9lmfxxxpirkbj3py76qnyfd1qhsq9msfw689zgzjqahk7zhz"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5250,24 +5286,24 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight-nvim"; - version = "2021-07-09"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9"; - sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28"; + rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7"; + sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2021-07-18"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac"; - sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd"; + rev = "896f2bed6b982ce5ca2c5bd454b8eb8af312e5a1"; + sha256 = "1pwlw8gq0vd8zc3xqmp8r2s2wka9m9i85w08av59rmwnizk6vkza"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -6006,12 +6042,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-16"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "ee390feaa3bc40de2afa32910ab09de287181146"; - sha256 = "0q2bnmi6yz7i7lx8i59gzk39fqzjc3y325qjhhyyahwb2xsazzcz"; + rev = "2e287bd7e73198408d73b7183e3019a3aff6c19b"; + sha256 = "1n1hipxim9d1shh9ch414yy15vdr8yc5ppgk7msv6zzgsw10qyaw"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7351,12 +7387,12 @@ final: prev: vim-jinja = buildVimPluginFrom2Nix { pname = "vim-jinja"; - version = "2016-11-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "lepture"; repo = "vim-jinja"; - rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; - sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; + rev = "2f0eeefe583ea477cb7605f972d57d7d5e55e13f"; + sha256 = "0r8508h9s2bikmv3wvw4iaq3j8i5n564k7s06aqx9j79i16asn22"; }; meta.homepage = "https://github.com/lepture/vim-jinja/"; }; @@ -7604,12 +7640,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-06-16"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf"; - sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m"; + rev = "7ba553effb021293c9ff5176b91e76da71797825"; + sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -7713,12 +7749,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-07-05"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "05f4962c64c5dcd720b8cf5f7af777de33f2fa43"; - sha256 = "10nfiban4ihsix2zf4qp38mcdmlz3zb6n01n5wkgz9yga28y9jxm"; + rev = "61802ad25f303dc37f575cbed9b902605353db49"; + sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8287,6 +8323,18 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; }; + vim-prettier = buildVimPluginFrom2Nix { + pname = "vim-prettier"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "prettier"; + repo = "vim-prettier"; + rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8"; + sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf"; + }; + meta.homepage = "https://github.com/prettier/vim-prettier"; + }; + vim-prettyprint = buildVimPluginFrom2Nix { pname = "vim-prettyprint"; version = "2016-07-16"; @@ -8385,12 +8433,12 @@ final: prev: vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2021-06-08"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646"; - sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l"; + rev = "65f115c350934517382ae45198a74232a9069c2a"; + sha256 = "0pylxkmhcanks59imah3q2xyn8lp5735xm17p13yx9vx90779nwp"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -9490,12 +9538,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-06-10"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9"; - sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v"; + rev = "e1be98dc050b8c5196e324cb4236e8c4b44483e6"; + sha256 = "12gr0v2r91q75v1wfrskp330zlyibshngs11if9nlxpnhgz8f6dn"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9695,12 +9743,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-15"; + version = "2021-07-18"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "13fac7d1d820ee4d72196841800705f149af9868"; - sha256 = "0k9325pdh5fscj8nhqwj36vdz6lvcgf14r7mmimc7g6i7bxxfpmb"; + rev = "830659752b8914f6b4567a00448901246e4d1841"; + sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9717,6 +9765,18 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; + vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { + pname = "vimway-lsp-diag-nvim"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "onsails"; + repo = "vimway-lsp-diag.nvim"; + rev = "dee2f59a45f72fb2ba0dd29cb06ed5357097ee07"; + sha256 = "16da94g367sb07d1xn55cvyi48zjgjv2c1p7mzabpidm9c7r99pm"; + }; + meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/"; + }; + vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; version = "2020-05-26"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 8ee937359cb..a63d0544128 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -251,6 +251,14 @@ self: super: { ''; }); + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: { + # The plugin has a makefile which tries to run tests in a docker container. + # This prevents it. + prePatch = '' + rm Makefile + ''; + }); + fzf-vim = super.fzf-vim.overrideAttrs (old: { dependencies = with self; [ fzfWrapper ]; }); @@ -635,7 +643,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg="; + cargoSha256 = "046c5w47isnz5l23kpk8zkbw312yp5dz9wq9dc2kmpklai71fc1a"; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1521ca5557f..3f1963101ce 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -161,6 +161,7 @@ fruit-in/vim-nong-theme fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate +gcmt/taboo.vim gcmt/wildfire.vim gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax @@ -505,6 +506,7 @@ Olical/aniseed Olical/conjure olimorris/onedark.nvim onsails/lspkind-nvim +onsails/vimway-lsp-diag.nvim OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -536,6 +538,7 @@ preservim/tagbar preservim/vim-pencil preservim/vim-wordy preservim/vimux +prettier/vim-prettier psliwka/vim-smoothie ptzz/lf.vim puremourning/vimspector @@ -627,6 +630,7 @@ sickill/vim-pasta SidOfc/mkdx simnalamburt/vim-mundo simrat39/rust-tools.nvim +simrat39/symbols-outline.nvim sindrets/diffview.nvim@main SirVer/ultisnips sjl/gundo.vim @@ -641,6 +645,7 @@ steelsojka/completion-buffers steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml +stsewd/fzf-checkout.vim stevearc/aerial.nvim sunaku/vim-dasht sunjon/Shade.nvim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c47e17b1c12..6507a603b86 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -85,6 +85,23 @@ let }; }; + angular.ng-template = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ng-template"; + publisher = "Angular"; + version = "12.1.2"; + sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; + description = "Editor services for Angular templates"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Angular.ng-template"; + homepage = "https://github.com/angular/vscode-ng-language-service"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + antfu.icons-carbon = buildVscodeMarketplaceExtension { mktplcRef = { name = "icons-carbon"; @@ -335,6 +352,23 @@ let meta = { license = lib.licenses.mit; }; }; + divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "competitive-programming-helper"; + publisher = "DivyanshuAgrawal"; + version = "5.8.5"; + sha256 = "25v2tdAX7fVl2B5nvOIKN9vP1G5rA0G67CiDQn9n9Uc="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; + description = "Makes judging, compiling, and downloading problems for competitve programming easy. Also supports auto-submit for a few sites."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DivyanshuAgrawal.competitive-programming-helper"; + homepage = "https://github.com/agrawal-d/cph"; + license = licenses.gpl3; + maintainers = with maintainers; [ arcticlimer ]; + }; + }; + donjayamanne.githistory = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog"; @@ -386,8 +420,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "11.5.1"; - sha256 = "sha256-Ic7eT8WX2GDYIj/aTu1d4m+fgPtXe4YQx04G0awbwnM="; + version = "11.6.0"; + sha256 = "sha256-JxCNE/IL/v94xWmhebsRZo1Gw+nSSpDgZ41ZGongGVI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -497,6 +531,12 @@ let }; foam.foam-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "foam-vscode"; + publisher = "foam"; + version = "0.14.1"; + sha256 = "sha256-w9xGkezS3A9z6sTk8WWgW7g8qYX6mJFfRV0lv5cu160="; + }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; description = "A personal knowledge management and sharing system for VSCode "; @@ -505,12 +545,6 @@ let license = licenses.mit; maintainers = with maintainers; [ ratsclub ]; }; - mktplcRef = { - name = "foam-vscode"; - publisher = "foam"; - version = "0.13.7"; - sha256 = "Y2pcd4iXPiuhJdD/9d+tbTJN18O4+kRMqUdOtbx8xy8="; - }; }; formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { @@ -1210,8 +1244,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.8"; - sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY="; + version = "0.3.9"; + sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 658495296bf..e934f03b209 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,19 +3,19 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.13.0"; + version = "2.13.2"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1wc4jl4h3ja4ivynf20yxzwqssi6yd7alvqvcjrkksic98480qcz"; + sha256 = "0h7c6p2dcwsg7wlp49p2fsq0f164pzkx65929imd1m2df77aykqa"; }; patches = [ ./fix-terraform-ls.patch ]; postPatch = '' - substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls + substituteInPlace out/clientHandler.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls ''; meta = with lib; { diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 95e8d92da33..9153276d367 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,17 +1,30 @@ +diff --git a/out/clientHandler.js b/out/clientHandler.js +index 7f9716d..a543d60 100644 +--- a/out/clientHandler.js ++++ b/out/clientHandler.js +@@ -33,8 +33,7 @@ class ClientHandler { + this.reporter.sendTelemetryEvent('usePathToBinary'); + } + else { +- const installPath = path.join(context.extensionPath, 'lsp'); +- this.pathToBinary = path.join(installPath, 'terraform-ls'); ++ this.pathToBinary = 'TERRAFORM-LS-PATH'; + } + } + startClients(folders) { diff --git a/out/extension.js b/out/extension.js -index e932d27..099126b 100644 +index 7a271fc..726bbf8 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -143,25 +143,6 @@ function updateLanguageServer() { - return __awaiter(this, void 0, void 0, function* () { - const delay = 1000 * 60 * 60 * 24; - languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs -- // skip install if a language server binary path is set +@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) { + updateLanguageServer(clientHandler, installPath); + }, 24 * hour); + // skip install if a language server binary path is set - if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { - const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); - const install = yield installer.needsInstall(); - if (install) { -- yield stopClients(); +- yield clientHandler.stopClients(); - try { - yield installer.install(); - } @@ -25,15 +38,6 @@ index e932d27..099126b 100644 - } - } - } - return startClients(); // on repeat runs with no install, this will be a no-op + return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op }); } -@@ -259,7 +240,7 @@ function pathToBinary() { - reporter.sendTelemetryEvent('usePathToBinary'); - } - else { -- command = path.join(installPath, 'terraform-ls'); -+ command = 'TERRAFORM-LS-PATH'; - } - _pathToBinaryPromise = Promise.resolve(command); - } diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index eac71ee36aa..412e5041500 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.239-hardened1.patch", - "sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch" + "name": "linux-hardened-4.14.240-hardened1.patch", + "sha256": "0j5zp0f8s4w3f60yam2spg3bx56bdjvv0mh632zlhchz8rdk5zs4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.240-hardened1/linux-hardened-4.14.240-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.197-hardened1.patch", - "sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch" + "name": "linux-hardened-4.19.198-hardened1.patch", + "sha256": "18c5j00xiwc0xn5klcrwazk6wvjiy3cixbfbrw4xj7zal9r5p6q9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.198-hardened1/linux-hardened-4.19.198-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.50-hardened1.patch", - "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch" + "name": "linux-hardened-5.10.52-hardened1.patch", + "sha256": "062a32rb1g5xk1npiz9fa114k7g4x9pmygycn3alc0phngjmvr98", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.52-hardened1/linux-hardened-5.10.52-hardened1.patch" }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.17-hardened1.patch", - "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch" + "name": "linux-hardened-5.12.19-hardened1.patch", + "sha256": "1nr3922gd6il69k5cpp9g3knpy6yjb6jsmpi9k4v02bkvypg86dc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.19-hardened1/linux-hardened-5.12.19-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.132-hardened1.patch", - "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch" + "name": "linux-hardened-5.4.134-hardened1.patch", + "sha256": "0iay6dxwd1vqj02ljf0ghncrqpr6b0gby90xiza8kkk8wnh3r9hh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.134-hardened1/linux-hardened-5.4.134-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5b94b7ea9b6..ccecc433a4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.239"; + version = "4.14.240"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0"; + sha256 = "1k65qwzlnqnh9ym0n2fxpa8nk2qwvykwhwgaixk3b7ndzmr8b6c8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 3785c6b5536..4ed06ee2205 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.197"; + version = "4.19.198"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6"; + sha256 = "13k0r6a4n8nbni64a18wqzy0pg4vn1zw2li78xrm78rqcrnah85y"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 5b7050b7069..6c2595386e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.275"; + version = "4.4.276"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1aiwq6019sibsw5smj6ii28cr64dv24c19k4n8c09nakhmhcg94i"; + sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 71a5f5eec31..0dc5cfeae6e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.275"; + version = "4.9.276"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08mz7mzmhk5n1gwadrc5fw8s40jk0rayvdpjcricl4sv56574lb6"; + sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 988de97e03b..f59cca3e12f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.50"; + version = "5.10.52"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb"; + sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 82218dc1cef..e1e7aec2ce2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.17"; + version = "5.12.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j"; + sha256 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index da90ee69de8..82defad373b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.2"; + version = "5.13.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563"; + sha256 = "0v3x1q1r0r8lyjg5hsj7yayfxqcgfj01p86ya4s0i9jaclpwv4ki"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 003f1e96e4f..c4e08b685b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.132"; + version = "5.4.134"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4"; + sha256 = "0haqw1w6f8p330ydbsl7iml1x0qqrv63az6921p2a70n88b8dyy9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 04c17eac255..758f6fd998a 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.1"; + version = "5.13.4"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA="; + sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 1b1acdb535f..f88cdcda523 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -1,41 +1,44 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib +, stdenv +, fetchurl +, kmod +, coreutils +}: -let - - version = "1.60"; +stdenv.mkDerivation rec { + pname = "lsiutil"; + version = "1.72"; src = fetchurl { - name = "lsiutil-${version}.zip"; - url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip"; - sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426"; + url = "https://github.com/exactassembly/meta-xa-stm/raw/f96cf6e13f3c9c980f5651510dd96279b9b2af4f/recipes-support/lsiutil/files/lsiutil-${version}.tar.gz"; + sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4="; }; -in - -stdenv.mkDerivation { - pname = "lsiutils"; - inherit version; + buildPhase = '' + runHook preBuild - srcs = [ src "Source/lsiutil.tar.gz" ]; + substituteInPlace lsiutil.c \ + --replace /sbin/modprobe "${kmod}/bin/modprobe" \ + --replace /bin/mknod "${coreutils}/bin/mknod" + gcc -Wall -O lsiutil.c -o lsiutil - nativeBuildInputs = [ unzip ]; + runHook postBuild + ''; - sourceRoot = "lsiutil"; + installPhase = '' + runHook preInstall - preBuild = - '' - mkdir -p $out/bin - substituteInPlace Makefile --replace /usr/bin $out/bin - substituteInPlace lsiutil.c \ - --replace /sbin/modprobe modprobe \ - --replace /bin/mknod $(type -P mknod) - ''; + mkdir -p "$out/bin" + install -Dm755 lsiutil "$out/bin/lsiutil" - installPhase = "true"; + runHook postInstall + ''; - meta = { - homepage = "http://www.lsi.com/"; - description = "LSI Logic Fusion MPT command line management tool"; - license = lib.licenses.unfree; + meta = with lib; { + homepage = "https://github.com/exactassembly/meta-xa-stm/tree/master/recipes-support/lsiutil/files"; + description = "Configuration utility for MPT adapters (FC, SCSI, and SAS/SATA)"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c13f97fcde7..a33bb3c1a1d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -157,6 +157,13 @@ stdenv.mkDerivation { url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch"; sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add"; }) + + # Fix CVE-2021-33910, disclosed 2021-07-20 + (fetchpatch { + name = "CVE-2021-33910.patch"; + url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch"; + sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4"; + }) ]; postPatch = '' diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 0a342997530..38293e65f70 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, windows, fetchurl }: let - version = "6.0.0"; + version = "9.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0"; + sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix index dfb073aa11f..4f1a128dd38 100644 --- a/pkgs/servers/althttpd/default.nix +++ b/pkgs/servers/althttpd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "althttpd"; - version = "unstable-2021-05-07"; + version = "unstable-2021-06-09"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "2c5e3f9f7051a578"; - sha256 = "sha256-+RuogtQAc+zjCWTOiOunu1pXf3LxfdWYQX+24ysJ7uY="; + rev = "0d3b5e232c57e188"; + sha256 = "sha256-vZwpjYYMdP/FgPTAQ9Kdh2RRMovpONqu2v73cCoYyxE="; }; installPhase = '' diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 7e734940885..d15844e682e 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "sha256-N0HoZgAtWPgYPU9OWpMEXO2qUoNIGCsFn9vll0hLal0="; + sha256 = "sha256-aO9PIE/YlSIGEcntDCdxIYuuvV5jG266ldhC2QfT+e4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 8370dfb16a5..039f0578569 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -46,7 +46,6 @@ in stdenv.mkDerivation rec { yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - phases = ["unpackPhase" "buildPhase"]; nativeBuildInputs = [ yarn' git ]; buildPhase = '' export HOME=$PWD diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index e65021599ad..8128ec6f04d 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - nativeBuildInputs = [ pytestrunner flake8]; + nativeBuildInputs = [ pytest-runner flake8]; propagatedBuildInputs = [ aioh2 @@ -22,7 +22,7 @@ buildPythonApplication rec { asynctest unittest-data-provider pytest - pytestcov + pytest-cov pytest-aiohttp ]; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8b9380c6baf..bece609fc4e 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "0nf2l8l23wzn3l3x4698rfr3g6lkx5qfzsbfl0rv25q1pqgybdzj"; + sha256 = "sha256-O8PJrowP9iDK4sQXHNi1eo44X/tRc7nyKZgJUB6fKC4="; }; vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo="; diff --git a/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch b/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch new file mode 100644 index 00000000000..add0ea1d552 --- /dev/null +++ b/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch @@ -0,0 +1,27 @@ +From 3e3f5c37252a33ea1e71c39f2ca0f13940c261ad Mon Sep 17 00:00:00 2001 +From: Martin Weinelt <hexa@darmstadt.ccc.de> +Date: Sat, 17 Jul 2021 16:11:23 +0200 +Subject: [PATCH] tests: ignore OSErrors in hass fixture + +The nix sandbox will cause OSErrors due to limitations imposed on +network interaction. This change makes it so we forgive these cases. +--- + tests/conftest.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 1f5ffc80d0..b284727a0f 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -168,6 +168,8 @@ def hass(loop, load_registries, hass_storage, request): + continue + if isinstance(ex, ServiceNotFound): + continue ++ if isinstance(ex, OSError): ++ continue + raise ex + + +-- +2.32.0 + diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 123984e66a4..2190bd6b278 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.6.6"; + version = "2021.7.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -27,6 +27,7 @@ "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ alpha-vantage ]; "amazon_polly" = ps: with ps; [ boto3 ]; + "ambee" = ps: with ps; [ ambee ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; @@ -90,7 +91,7 @@ "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; - "bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ]; + "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 @@ -157,7 +158,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr netdisco pillow scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr pillow scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -176,7 +177,7 @@ "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; - "discogs" = ps: with ps; [ discogs_client ]; + "discogs" = ps: with ps; [ discogs-client ]; "discord" = ps: with ps; [ discordpy ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; @@ -276,6 +277,7 @@ "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ foobot-async ]; + "forecast_solar" = ps: with ps; [ forecast-solar ]; "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi ]; "foscam" = ps: with ps; [ libpyfoscam ]; @@ -283,7 +285,8 @@ "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection ]; + "freedompro" = ps: with ps; [ pyfreedompro ]; + "fritz" = ps: with ps; [ aiohttp-cors fritzconnection fritzprofiles ifaddr xmltodict ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; @@ -520,6 +523,7 @@ "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem + "modern_forms" = ps: with ps; [ aiomodernforms ]; "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; @@ -732,6 +736,7 @@ "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors ]; "season" = ps: with ps; [ ephem ]; + "select" = ps: with ps; [ ]; "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat @@ -742,7 +747,7 @@ "serial_pm" = ps: with ps; [ pmsensor ]; "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 "seven_segments" = ps: with ps; [ pillow ]; - "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track + "seventeentrack" = ps: with ps; [ py17track ]; "sharkiq" = ps: with ps; [ sharkiqpy ]; "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ aioshelly ]; @@ -788,7 +793,7 @@ "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket pysonos zeroconf ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -800,7 +805,7 @@ "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; "srp_energy" = ps: with ps; [ srpenergy ]; - "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ]; + "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ]; "starline" = ps: with ps; [ starline ]; "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; @@ -907,7 +912,7 @@ "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ upcloud-api ]; "updater" = ps: with ps; [ distro ]; - "upnp" = ps: with ps; [ async-upnp-client ]; + "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus @@ -972,13 +977,13 @@ "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors ifaddr netdisco zeroconf ]; - "xiaomi_miio" = ps: with ps; [ construct python-miio ]; + "xiaomi_miio" = ps: with ps; [ construct micloud python-miio ]; "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; - "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast + "yamaha_musiccast" = ps: with ps; [ aiomusiccast ]; "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; "yeelight" = ps: with ps; [ yeelight ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c9a4a15a87c..36af74cc162 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,19 +22,7 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - - # Pinned due to API changes in aiopvpc>=2.2.0, remove after 2021.7.0 - (self: super: { - aiopvpc = super.aiopvpc.overridePythonAttrs (oldAttr: rec { - version = "2.1.2"; - src = fetchFromGitHub { - owner = "azogue"; - repo = "aiopvpc"; - rev = "v${version}"; - sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr"; - }; - }); - }) + (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged @@ -70,19 +58,6 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") - # Pinned due to API changes in pyatmo>=5.1.0 - (self: super: { - pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec { - version = "5.0.1"; - src = fetchFromGitHub { - owner = "jabesq"; - repo = "pyatmo"; - rev = "v${version}"; - sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh"; - }; - }); - }) - # Pinned due to API changes in pyatv>=0.8.0 (self: super: { pyatv = super.pyatv.overridePythonAttrs (olAttrs: rec { @@ -149,8 +124,6 @@ let }); }) - (mkOverride "pysma" "0.4.3" "sha256-vriMnJFS7yfTyDT1f4sx1xEBTQjqc4ZHmkdHp1vcd+Q=") - # Pinned due to API changes in eebrightbox>=0.0.5 (self: super: { eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec { @@ -197,7 +170,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.6.6"; + hassVersion = "2021.7.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -214,11 +187,12 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0r8l2qya9pdl65kq3xrnb1vhmbnxm3bj12hn1wyxmw56l8m9l5d5"; + sha256 = "1dx1pmi0w265pyajmmvd7k6vb5z7s77a7b161zd0n4zsb989dil6"; }; # leave this in, so users don't have to constantly update their downstream patch handling patches = [ + ./0001-tests-ignore-OSErrors-in-hass-fixture.patch ]; postPatch = '' @@ -673,7 +647,8 @@ in with py.pkgs; buildPythonApplication rec { "somfy_mylink" "sonarr" "songpal" - "sonos" + # disable sonos components test because they rely on ssdp, which doesn't work in our sandbox + # "sonos" "soundtouch" "spaceapi" "speedtestdotnet" @@ -735,7 +710,8 @@ in with py.pkgs; buildPythonApplication rec { "upb" "upcloud" "updater" - "upnp" + # disabled, because it tries to join a multicast group and fails to find a usable network interface + # "upnp" "uptime" "usgs_earthquakes_feed" "utility_meter" @@ -751,7 +727,8 @@ in with py.pkgs; buildPythonApplication rec { "vizio" "voicerss" "volumio" - "vultr" + # disabled, becaused AttributeError: <class 'vultr.vultr.Vultr'> does not have the attribute 'server_list' + # "vultr" "wake_on_lan" "wallbox" "water_heater" @@ -776,7 +753,8 @@ in with py.pkgs; buildPythonApplication rec { "yandex_transport" "yandextts" "yeelight" - "zeroconf" + # disabled, because it tries to join a multicast group and fails to find a usable network interface + # "zeroconf" "zerproc" "zha" "zodiac" @@ -826,6 +804,8 @@ in with py.pkgs; buildPythonApplication rec { # wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known "--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth" "--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect" + # tests/components/default_config/test_init.py: Tries to check for updates and fails ungracefully without network access + "--deselect tests/components/default_config/test_init.py::test_setup" # tests are located in tests/ "tests" # dynamically add packages required for component tests @@ -861,6 +841,10 @@ in with py.pkgs; buildPythonApplication rec { "test_onboarding_core_no_rpi_power" # hue/test_sensor_base.py: Race condition when counting events "test_hue_events" + # homekit/test_homekit.py: Tries to use zeroconf, which tries to join a multicast group + "test_homekit_uses_system_zeroconf" + # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' + "test_lock_update_via_pubnub" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f59f3943cd0..a42b13a260d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210603.0"; + version = "20210707.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2UhbtaxEcOkD9Z5g9gZs+QjuVLXZGCEcmKoxRtIEYxw="; + sha256 = "sha256-6RR+T4+vS6g00+MS1ty8aFVx6WM2dE+c17+wDoPxnGg="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index 5ed865f411e..8b17dabdfe2 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -23,10 +23,16 @@ sed -i -e "s/version =.*/version = \"${TARGET_VERSION}\";/" \ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ default.nix -./parse-requirements.py ( + # update the frontend before running parse-requirements, so it doesn't get shown as outdated cd ../../.. nix-update --version "$FRONTEND_VERSION" home-assistant.python.pkgs.home-assistant-frontend +) + +./parse-requirements.py + +( + cd ../../.. nix-update --version "$TARGET_VERSION" --build home-assistant ) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index ea6cd9ae04c..594085d422e 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -4,6 +4,7 @@ , cairo , fetchurl , flac +, gcc11 , gnome , gssdp , gupnp @@ -16,13 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.24.1-62"; + version = "4.24.2-63"; src = fetchurl { - # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs - # c.f. https://github.com/NixOS/nixpkgs/pull/111616 - url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs="; + url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; + sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg="; }; unpackPhase = '' @@ -35,6 +34,7 @@ stdenv.mkDerivation rec { alsa-lib cairo flac + gcc11.cc.lib gnome.rygel gssdp gupnp @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { # misc service support files mkdir -p $out/var/lib/hqplayerd - cp -r ./var/hqplayer/web $out/var/lib/hqplayerd + cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer runHook postInstall ''; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 5baba231026..4f26610e10c 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2014-06-29-1"; pname = "nix-binary-cache"; - phases = ["installPhase"]; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 4ce0d63f6be..04be8c63599 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -2,7 +2,6 @@ , lib , fakeroot , fetchurl -, fetchpatch , libfaketime , substituteAll ## runtime dependencies @@ -70,11 +69,7 @@ stdenv.mkDerivation { }; patches = [ # adjust configure check to work with libtiff > 4.1 - (fetchpatch { - name = "libtiff-4.2.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6"; - sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw"; - }) + ./libtiff-4.patch ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch new file mode 100644 index 00000000000..daf7b4f7d05 --- /dev/null +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/706154 +--- a/configure ++++ b/configure +@@ -2583,7 +2583,7 @@ EOF + echo '#define TIFFSTRIPBYTECOUNTS uint32' + echo '#define TIFFVERSION TIFF_VERSION' + echo '#define TIFFHEADER TIFFHeader';; +- 4.[01]) tiff_runlen_t="uint32" ++ 4.[0-9]) tiff_runlen_t="uint32" + tiff_offset_t="uint64" + echo '#define TIFFSTRIPBYTECOUNTS uint64' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 601e93a998a..fc099e905e5 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.16.6"; + version = "2.16.7"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-wrd8G2y8oepaHMJaU4Bcvkf91ABX4ZapQSlztq4Gg84="; + sha256 = "sha256-7UGIkYChXIht/dyMhvPeu8oeGQEA7/Ns7+e56wEmAwQ="; rev = "v${version}"; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 341c9130481..a324dcb58bd 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.372"; + version = "0.18.455"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-GkAKYxa5F0N9jg9TZrwt3hjkhybZTKU2Ia/gIxBRGuo="; + sha256 = "sha256-qEuhgtDtdMCHJtUcUDUmKI8FT0ti7veleI7UhwTAUfE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 63ad531bbef..f120454ac84 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -5,14 +5,14 @@ , unstableGitUpdater }: stdenv.mkDerivation rec { - name = "klipper"; - version = "unstable-2021-01-31"; + pname = "klipper"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3"; - sha256 = "sha256-puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA="; + rev = "dafb74e3aba707db364ed773bb2135084ac0fffa"; + sha256 = "sha256-wF5I8Mo89ohhysBRDMtkCDbCW9SKWrdYdbifmxCPJBc="; }; # We have no LTO on i686 since commit 22284b0 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Klipper 3D printer firmware"; homepage = "https://github.com/KevinOConnor/klipper"; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault zhaofengli ]; platforms = platforms.linux; license = licenses.gpl3Only; }; diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index 28c54fc0fae..76b92299409 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { src = script; - phases = [ "buildPhase" ]; + dontUnpack = true; + dontInstall = true; + buildPhase = '' mkdir -p $out/bin < $src sed "s#{{MYPATH}}#$out/bin/sendmail#" > $out/bin/sendmail diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c7894529e2b..b2e61d50656 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.38.0"; + version = "1.38.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k9/enFktixO4zvgBW3zw0COBakDP1PHVWAlbMi+FiWQ="; + sha256 = "sha256-bGKGzhuDjKaNbjXSwvidk9SrRmJsLQyLe5jps4DXN+s="; }; patches = [ diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index c7dc3ecad58..76897d92820 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,29 +1,17 @@ { lib, python3, fetchFromGitHub }: -let - python = python3.override { - packageOverrides = self: super: { - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.8.18"; - src = oldAttrs.src.override { - inherit version; - sha256 = "32daf7a7dcf5d4013b37321df7b319f36523f38884ccc3e2e965917d0a5c73c1"; - }; - }); - }; - }; -in python.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "0.1.1"; + version = "unstable-2021-07-01"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-signal"; - rev = "v${version}"; - sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl"; + rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f"; + sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl"; }; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ CommonMark aiohttp asyncpg @@ -53,7 +41,7 @@ in python.pkgs.buildPythonPackage rec { " > $out/bin/mautrix-signal chmod +x $out/bin/mautrix-signal wrapProgram $out/bin/mautrix-signal \ - --set PATH ${python}/bin \ + --set PATH ${python3}/bin \ --set PYTHONPATH "$PYTHONPATH" ''; diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix new file mode 100644 index 00000000000..8112feb75fe --- /dev/null +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: +buildGoModule rec { + pname = "buildkite-agent-metrics"; + version = "5.2.1"; + + outputs = [ "out" "lambda" ]; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "buildkite-agent-metrics"; + rev = "v${version}"; + sha256 = "XZYVCSJ/DIwoLrz37aQ3yW3RUhOhorY8L1AsAWxywcg="; + }; + + vendorSha256 = "UIkU3i45IEXWHdiakTj7f4W9kR49k4A93msfkqeXmQQ="; + + patches = [ + # Necessary to support passing the agent token in an env var, rather than on + # the command line. Should be removed upon the next release. + (fetchpatch { + name = "BUILDKITE_AGENT_TOKEN-env-var.patch"; + url = "https://github.com/buildkite/buildkite-agent-metrics/commit/6c40b478b95f0e05fc12b87158222a9ff68169e0.patch"; + sha256 = "Y4m9qGyPIROSqOY6G6xRQfFENEG4bFF3q5dZcHI4XiY="; + }) + ]; + + postInstall = '' + mkdir -p $lambda/bin + mv $out/bin/lambda $lambda/bin + ''; + + meta = with lib; { + description = "A command-line tool (and Lambda) for collecting Buildkite agent metrics"; + homepage = "https://github.com/buildkite/buildkite-agent-metrics"; + license = licenses.mit; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index c772b76cf03..4c9d0437d79 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "0kqbn6fqlrxjqdkkhbr7qmm2m05a7dlskfdb7y4gr5ggi65m6ik5"; + sha256 = "sha256-rHJGVQWbvgcvwPzt8e2uWs1n4bbaAZz6lQjyvmqmLZw="; }; - vendorSha256 = "0xi69a1zkcmi5q8m7lfwp3xb4cbkwc2dzqm24lfqsq13xj5jq6ph"; + vendorSha256 = "sha256-jA8M8ZdJWmrGRQb0W1duVV+XwxqJVQ/ek0Yhw6JZvX8="; patches = [ # https://github.com/grafana/agent/issues/731 diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4fa00325009..2c8ba20f6d4 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.5"; + version = "8.0.6"; - excludedPackages = [ "release_publisher" ]; + excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\)"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-tehqb86Mkg1dD4x34zHwLD9uV/PssslLDIs9bl28ap0="; + sha256 = "sha256-incw/Uv1Jeg/WAkWUgJGvdJ2OpZYfkCAvgLW/qXWXEo="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-aVZpTQ4ERrJV3YN4U0v/tJoYkTg7vlQVe6sIIK2NE0k="; + sha256 = "sha256-JSpNAi9NvZpo0HzdDmdi1i+lNGLylHgctT6PPWHNhkk="; }; - vendorSha256 = "sha256-INvFZ9hNbtpaDXuhBPaSaqBZyi7QJ18tMk+AZjJtYjg="; + vendorSha256 = "sha256-72i2NgulRpdBZ9dwx+0VlKDzzNnBJgEKKizrLPwzUY4="; preBuild = '' # The testcase makes an API call against grafana.com: diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 85b4c7069a9..0ef21497597 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.5"; - zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ="; + version = "1.2.6"; + zipHash = "sha256-gbMD2o8A2YYZzkpYiXNkv8Oj958RP47fL6DXj1SBYF0="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 44c512196c6..00f7b510346 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.12.4"; + version = "2.12.5"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-SJBOZzLbmW4525G3w6BVS53kOd2bJ5rEbwwb4Lo5q8I="; + sha256 = "sha256-sEmxKX+q7hPXQWEqbywgsEG5/bSE5AkNKurL3UGQFLA="; }; patches = [ diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index b87817af439..f4ad8a8e7b9 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, go, buildGoModule, fetchFromGitHub, mkYarnPackage, nixosTests +{ stdenv +, lib +, go +, buildGoModule +, fetchFromGitHub +, mkYarnPackage +, nixosTests , fetchpatch }: @@ -27,7 +33,8 @@ let installPhase = "mv build $out"; distPhase = "true"; }; -in buildGoModule rec { +in +buildGoModule rec { pname = "prometheus"; inherit src version; @@ -41,19 +48,21 @@ in buildGoModule rec { ''; buildFlags = "-tags=builtinassets"; - buildFlagsArray = let - t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; - in [ - '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - '' - ]; + buildFlagsArray = + let + t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; + in + [ + '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=unknown + -X ${t}.Branch=unknown + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=unknown + -X ${t}.GoVersion=${lib.getVersion go} + '' + ]; # only run this in the real build, not during the vendor build # this should probably be fixed in buildGoModule @@ -67,7 +76,8 @@ in buildGoModule rec { cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; - doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 + # doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 + doCheck = false; passthru.tests = { inherit (nixosTests) prometheus; }; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 4dd90cacb8b..a94de966e4d 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fixij04n8hgmaj8kw8i6vclwyd6n94x0n6ify73ynm6dfv8g37x"; }; - phases = ["installPhase"]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 14061974a9d..77eae32e27f 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms"; + sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb"; }; # Cross-compiling fixes diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index ff676b27763..1d527fb203c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,24 +12,22 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.4.4805-186bae04e"; + version = "1.23.5.4841-549599676"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx"; + sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq"; + sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb"; }; outputs = [ "out" "basedb" ]; nativeBuildInputs = [ dpkg ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; - unpackPhase = '' dpkg-deb -R $src . ''; @@ -90,6 +88,7 @@ stdenv.mkDerivation rec { pjones thoughtpolice maxeaubrey + MayNiklas ]; description = "Media library streaming server"; longDescription = '' diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index b0902feeead..d4ab51ce84f 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ - pytestrunner + pytest-runner pytest ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 75afedaa2dd..0b0b5a0f829 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { cp -r * $out/ ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php rm -rf $out/installer + # shut up updater + rm $out/composer.json-dist ''; passthru.withPlugins = f: buildEnv { diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index bf408551a44..2cdd33a245e 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -26,12 +26,15 @@ let mixFodDeps = beamPackages.fetchMixDeps { pname = "${pname}-deps"; inherit src version; - sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6"; + sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi"; # We need ecto 3.6 as this version checks whether the database exists before # trying to create it. The creation attempt would always require super-user privileges # and since 3.6 this isn't the case anymore. - patches = [ ./ecto_sql-fix.patch ]; + patches = [ + ./ecto_sql-fix.patch + ./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch + ]; }; yarnDeps = mkYarnModules { diff --git a/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch b/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch new file mode 100644 index 00000000000..b8aa7319a21 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch @@ -0,0 +1,26 @@ +From 127a77882879e5cdf32d908ee3b1b6cbdc9e482e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> +Date: Wed, 14 Jul 2021 01:20:29 +0200 +Subject: [PATCH] Bump `clickhouse_ecto` dependency to be compatible with ecto + 3.6 + +--- + mix.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mix.lock b/mix.lock +index ecae8ac..d42af1e 100644 +--- a/mix.lock ++++ b/mix.lock +@@ -12,7 +12,7 @@ + "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"}, + "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"}, + "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"}, +- "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "b30ccc93a4101a25ff0bba92113e18d8a9a8b28e", []}, ++ "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "1969f14ecef7c357b2bd8bdc3e566234269de58c", []}, + "clickhousex": {:git, "https://github.com/plausible/clickhousex", "0832dd4b1af1f0eba1d1018c231bf0d8d281f031", []}, + "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"}, + "comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"}, +-- +2.31.1 + diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index bf0b7472c57..bec59404103 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -52,8 +52,6 @@ in stdenv.mkDerivation rec { makeFlags = [ "deps" ]; - phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ]; - installPhase = '' for i in deps/*; do ( cd $i diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 65ed6d5000c..b7fa5453d87 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -12,7 +12,7 @@ , Security , nghttp2 , libgit2 -, withStableFeatures ? true +, withExtraFeatures ? true }: rustPlatform.buildRustPackage rec { @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; - cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index f1ce243bfa6..350decef22d 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -16,7 +16,6 @@ let version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; nativeBuildInputs = [ cmake addOpenGLRunpath ]; buildInputs = [ cudatoolkit ]; - enableParallelBuilding = true; postFixup = '' for exe in $out/bin/*; do addOpenGLRunpath $exe diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix index b954205990b..87c643af483 100644 --- a/pkgs/tools/X11/xgeometry-select/default.nix +++ b/pkgs/tools/X11/xgeometry-select/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0s7kirgh5iz91m3qy8xiq0j4gljy8zrcnylf4szl5h0lrsaqj7ya"; }; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildInputs = [ libX11 ]; diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix index 2c1ae4bdf61..754904449ef 100644 --- a/pkgs/tools/X11/xob/default.nix +++ b/pkgs/tools/X11/xob/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 1ce3cb452b8..d84c1816fec 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, groff, less, fetchFromGitHub }: +{ lib, python3, groff, less, fetchFromGitHub, fetchpatch }: let py = python3.override { packageOverrides = self: super: { @@ -33,6 +33,13 @@ with py.pkgs; buildPythonApplication rec { sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/mgorny/aws-cli/commit/85361123d2fa12eaedf912c046ffe39aebdd2bad.patch"; + sha256 = "sha256-1Rb+/CY7ze1/DbJ6TfqHF01cfI2vixZ1dT91bmHTg/A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "awscrt==0.11.13" "awscrt" \ diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index cb43f525680..b93ab0e867b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.26.0"; + version = "2.26.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-O5EL51RRxrp6D82p0Qbo59y/GAkBDhIkIdTxnagKgkY="; + sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 48851c3784b..ee2efb206af 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "docker-credential-gcr"; - version = "2.0.4"; + version = "2.0.5"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ="; + sha256 = "sha256-WrcGTXy5SMWDHJWddXUuvUvEWjOsJcoB1zBg02p5ggY="; }; meta = with lib; { diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 0bfedc2f036..6a28e18c7d3 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-Wa6uvoAsPuswcrPgkLb8qTDEbUyeSeRSIO5t9z5/dqY="; + sha256 = "sha256-5Y//OD/UsqDnM8MPVJghrc5SbVwBEG/Eu761QWy5xK8="; }; - vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; + vendorSha256 = "sha256-CQ7A4vwUrshKRZBdIJZlCXmcxS0O0CkE1tNkZskYu1E="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index b37f3ce465e..4fb11de26c3 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-2pkSwr/8pmRedcsvl55wHskv0aSAjlIbmHFUoTXCTE0="; + sha256 = "sha256-ETj14xwCQJv3xNYXFY/Z0FsxjxLrlpcVkap2sRsLzVU="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 245c1dfef8c..dc8dd1fd7a6 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 1711792ab2b..65ca85b463e 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ cached-property - ConfigArgParse + configargparse pyparsing jinja2 nose diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 6c105cf9b33..c183e374142 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -65,8 +65,8 @@ buildPythonApplication rec { checkInputs = [ mock pytest - pytestcov - pytest_xdist + pytest-cov + pytest-xdist vcrpy ]; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index e86bfb31101..0578bb4703c 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs="; + sha256 = "sha256-zqRjMCyFT7knI1/zH+RF1pA/OKaDhJZLLjWJhfmqopE="; }; - cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA="; + cargoSha256 = "sha256-W/ZMDbHC1VsllTSxCt77n4eb8Xgfj9YNx5NG5u+D+qA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 25d3eaa15fc..31cb2861f39 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado + pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado ]; meta = with lib; { diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 20d17b77741..1ef584ec977 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk -, fontDirectories , cmake, gettext, libtool , libGLU , gnutls, pam, nettle , xterm, openssh, perl , makeWrapper +, nixosTests }: with lib; @@ -22,17 +22,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560="; }; - inherit fontDirectories; postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= - for i in $fontDirectories; do - for j in $(find $i -name fonts.dir); do - addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) - done - done - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' ''; @@ -98,6 +91,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; + passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC; + meta = { homepage = "https://tigervnc.org/"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f69909d8546..50ca76f0d6d 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oiaH0w7TEztR1i0wBuXXr+JN37UZOQ/zObBzQQvAnZY="; + sha256 = "sha256-aYPG0xvuijASKXBGgB+6UyF9bmeU8l5snOoPWI8Ewh8="; }; - vendorSha256 = "sha256-bIQSZ+QQ0CnyOQ692Wpy4nXIPDSkD3LmnjwHZRG6soY="; + vendorSha256 = "sha256-4FO6/1eNyxy/CH7XMUkLfRqEg2+XUXL1gKleL6o4EoM="; excludedPackages = "misc"; diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index ebfd6c21772..a1558248f80 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, x11vnc +, xrandr +, libGL +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ netifaces pyqt5 @@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec { xrandr ]; - postPatch = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + # import Qt.labs.platform failed without this + "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" + ]; + + postPatch = '' substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ ''; meta = with lib; { diff --git a/pkgs/tools/archivers/arj/default.nix b/pkgs/tools/archivers/arj/default.nix new file mode 100644 index 00000000000..e09e390fa47 --- /dev/null +++ b/pkgs/tools/archivers/arj/default.nix @@ -0,0 +1,150 @@ +{stdenv, lib, fetchurl, fetchpatch, autoreconfHook}: + +stdenv.mkDerivation rec { + pname = "arj"; + version = "3.10.22"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1nx7jqxwqkihhdmdbahhzqhjqshzw1jcsvwddmxrwrn8rjdlr7jq"; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/001_arches_align.patch"; + sha256 = "0i3qclm2mh98c04rqpx1r4qagd3wpxlkj7lvq0ddpkmr8bm0fh0m"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/002_no_remove_static_const.patch"; + sha256 = "0zfjqmjsj0y1kfzxbp29v6nxq5qwgazhb9clqc544sm5zn0bdp8n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/003_64_bit_clean.patch"; + sha256 = "0mda9fkaqf2s1xl6vlbkbq20362h3is9dpml9kfmacpbifl4dx3n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/004_parallel_build.patch"; + sha256 = "0gam6k7jknzmbjlf1r6c9kjh5s5h76pd31v59cnaqiycwiy8z6q9"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/005_use_system_strnlen.patch"; + sha256 = "0q0ypm8mdsxd0rl1k0id6fdx5m7mvqgwcla4r250cmc6zqzpib6d"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/006_use_safe_strcpy.patch"; + sha256 = "1garad95s34cix3kd77lz37andrcnz19glzkfdnkjaq7ldvzwikc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/hurd_no_fcntl_getlk.patch"; + sha256 = "0b3hpn4qypimrw9ar2n4h24886sl6pmim4lb4ly1wqcq0f73arva"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security_format.patch"; + sha256 = "0q67cvln55p38bm0xwd2cgppqmkp2nfar2pg1zj78f7ncn35lbvf"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/doc_refer_robert_k_jung.patch"; + sha256 = "1wxdx0m6a9vdvjlaycwsissn75l1ni7grg8n6qmkynz2vrcvgzb1"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix.patch"; + sha256 = "19ycp1rak7l6ql28m50v95ls621w3sl8agw5r5va73svkgh8hc3g"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_flags.patch"; + sha256 = "1jw1y9i9lw1idgi4l9cycwsql1hcz1m4f3k2iybwsgx0acaw695q"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_strip.patch"; + sha256 = "1b18khj6cxnjyqk2ycygwqlcs20hrsbf4h6bckl99dxnpbq5blxi"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_pie.patch"; + sha256 = "1jqswxgc1plipblf055n9175fbanfi6fb67lnzk8dcvxjn227fs3"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/self_integrity_64bit.patch"; + sha256 = "0s5zdq81a0f83hdg9hy6lqn3xvckx9y9r20awczm9mbf11vi01cb"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-afl.patch"; + sha256 = "0yajcwpghij8wg21a0kkp3f9x7anz5m121jx2vnkyn04bvi9541a"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-dir.patch"; + sha256 = "10lv3867k0wm2s0cyf40hkxfqbjaxm4aph5ivk2q2rjkracrn2y4"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-symlink.patch"; + sha256 = "095pdfskxwh0jnyy31dpz10s2ppv8n7lvvn4q722y3g71d0c79qq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/out-of-bounds-read.patch"; + sha256 = "0ps9lqkbqzlhzr2bnr47sir431z1nywr7nagkmk42iki4d96v0jq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/remove_build_date.patch"; + sha256 = "1vjlfq6firxpj068l9acyqs77mfydn1rwgr2jmxgsy9mq0fw1dsc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/reproducible_help_archive.patch"; + sha256 = "0l3qi9f140pwc6fk8qdbxx4g9d8zlf45asimmr8wfpbi4pf59n8i"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_cross.patch"; + sha256 = "1vb0vbh3jbxj192q47vg3f41l343ghcz2ypbrrm2bkbpwm5cl8qr"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/fix-time_t-usage.patch"; + sha256 = "012c6pnf5y4jwn715kxn3vjy088rm905959j6yh8bslyx84qaijv"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix_autoreconf.patch"; + sha256 = "0yhxbdasnbqcg1nyx2379fpbr7fmdlv4n2nlxrv1z1vbc7rlvw9d"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + preAutoreconf = '' + cd gnu + ''; + + postConfigure = '' + cd .. + ''; + + meta = with lib; { + description = "Open-source implementation of the world-famous ARJ archiver"; + longDescription = '' + This version of ARJ has been created with an intent to preserve maximum + compatibility and retain the feature set of the original ARJ archiver as + provided by ARJ Software, Inc. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/archivers/lha/default.nix b/pkgs/tools/archivers/lha/default.nix new file mode 100644 index 00000000000..f6b5c2bd135 --- /dev/null +++ b/pkgs/tools/archivers/lha/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation { + pname = "lha"; + version = "unstable-2021-01-07"; + + src = fetchFromGitHub { + owner = "jca02266"; + repo = "lha"; + rev = "03475355bc6311f7f816ea9a88fb34a0029d975b"; + sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms"; + platforms = platforms.unix; + maintainers = [ maintainers.sander ]; + # Some of the original LhA code has been rewritten and the current author + # considers adopting a "true" free and open source license for it. + # However, old code is still covered by the original LHa license, which is + # not a free software license (it has additional requirements on commercial + # use). + license = licenses.unfree; + }; +} diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c218aa7e4e1..059174ae0a2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -133,7 +133,7 @@ in pythonPackages.buildPythonApplication rec { ++ lib.optional enableAcoustid pythonPackages.pyacoustid ++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableDiscogs pythonPackages.discogs-client ++ lib.optional (enableFetchart || enableDeezer || enableEmbyupdate @@ -175,7 +175,7 @@ in pythonPackages.buildPythonApplication rec { # https://github.com/beetbox/beets/blob/v1.4.9/setup.py pylast mpd2 - discogs_client + discogs-client pyxdg ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 76b7d1da59b..770a64b841c 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "discordchatexporter-cli"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg"; + sha256 = "0hbhDlGEK2rxuCByW8RaT/0vne8Z+q0ZobCkW1FBoG8="; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a7703f2ba2c..9849e6c6366 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,8 +1,8 @@ { fetchNuGet }: [ (fetchNuGet { name = "CliFx"; - version = "2.0.4"; - sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj"; + version = "2.0.6"; + sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; }) (fetchNuGet { name = "Gress"; @@ -46,8 +46,13 @@ }) (fetchNuGet { name = "Spectre.Console"; - version = "0.40.0"; - sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1"; + version = "0.41.0"; + sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; + }) + (fetchNuGet { + name = "Superpower"; + version = "2.3.0"; + sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) (fetchNuGet { name = "System.Memory"; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index a6f509d2504..28929615bcd 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,5 +1,6 @@ { lib, stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch , python38 , librsync , ncftp @@ -18,11 +19,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.17"; + version = "0.8.20"; - src = fetchurl { - url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "114rwkf9b3h4fcagrx013sb7krc4hafbwl9gawjph2wd9pkv2wx2"; + src = fetchFromGitLab { + owner = "duplicity"; + repo = "duplicity"; + rev = "rel.${version}"; + sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm"; }; patches = [ @@ -32,6 +35,13 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch + + # https://gitlab.com/duplicity/duplicity/-/merge_requests/64 + # remove on next release + (fetchpatch { + url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch"; + sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0"; + }) ] ++ lib.optionals stdenv.isLinux [ # Broken on Linux in Nix' build environment ./linux-disable-timezone-test.patch @@ -39,6 +49,15 @@ pythonPackages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + preConfigure = '' + # fix version displayed by duplicity --version + # see SourceCopy in setup.py + ls + for i in bin/*.1 duplicity/__init__.py; do + substituteInPlace "$i" --replace '$version' "${version}" + done + ''; + nativeBuildInputs = [ makeWrapper gettext @@ -51,7 +70,6 @@ pythonPackages.buildPythonApplication rec { pythonPath = with pythonPackages; [ b2sdk - boto boto3 cffi cryptography @@ -82,7 +100,7 @@ pythonPackages.buildPythonApplication rec { mock pexpect pytest - pytestrunner + pytest-runner ]); postInstall = '' @@ -103,6 +121,9 @@ pythonPackages.buildPythonApplication rec { # Don't run developer-only checks (pep8, etc.). export RUN_CODE_TESTS=0 + + # check version string + duplicity --version | grep ${version} '' + lib.optionalString stdenv.isDarwin '' # Work around the following error when running tests: # > Max open files of 256 is too low, should be >= 1024. diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/tools/backup/duplicity/gnutar-in-test.patch index 694fc881950..ee95b68e2ab 100644 --- a/pkgs/tools/backup/duplicity/gnutar-in-test.patch +++ b/pkgs/tools/backup/duplicity/gnutar-in-test.patch @@ -1,9 +1,11 @@ +diff --git a/testing/functional/test_restart.py b/testing/functional/test_restart.py +index 6d972c82..e8435fd5 100644 --- a/testing/functional/test_restart.py +++ b/testing/functional/test_restart.py -@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest): +@@ -350,14 +350,7 @@ class RestartTestWithoutEncryption(RestartTest): https://launchpad.net/bugs/929067 """ - + - if platform.system().startswith(u'Linux'): - tarcmd = u"tar" - elif platform.system().startswith(u'Darwin'): @@ -13,6 +15,6 @@ - else: - raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform()) + tarcmd = u"tar" - + # Intial normal backup - self.backup("full", "testfiles/blocktartest") + self.backup(u"full", u"{0}/testfiles/blocktartest".format(_runtest_dir)) diff --git a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch index b5e6df18a15..e322625cdbf 100644 --- a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch +++ b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch @@ -1,10 +1,16 @@ +commit f0142706c377b7c133753db57b5c4c90baa2de30 +Author: Guillaume Girol <symphorien+git@xlumurb.eu> +Date: Sun Jul 11 17:48:15 2021 +0200 + +diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py +index 4be5000c..80545853 100644 --- a/testing/unit/test_statistics.py +++ b/testing/unit/test_statistics.py -@@ -59,6 +59,7 @@ class StatsObjTest(UnitTestCase): +@@ -63,6 +63,7 @@ class StatsObjTest(UnitTestCase): s1 = StatsDeltaProcess() - assert s1.get_stat('SourceFiles') == 0 - + assert s1.get_stat(u'SourceFiles') == 0 + + @unittest.skip("Broken on Linux in Nix' build environment") def test_get_stats_string(self): - """Test conversion of stat object into string""" + u"""Test conversion of stat object into string""" s = StatsObj() diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch index c02527cf394..a5ddc4381bd 100644 --- a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch +++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -1,48 +1,62 @@ +commit ccd4dd92cd37acce1da20966ad9e4e0c7bcf1709 +Author: Guillaume Girol <symphorien+git@xlumurb.eu> +Date: Sun Jul 11 12:00:00 2021 +0000 + + use installed duplicity when running tests + +diff --git a/setup.py b/setup.py +index fa474f20..604a242a 100755 --- a/setup.py +++ b/setup.py -@@ -92,10 +92,6 @@ class TestCommand(test): +@@ -205,10 +205,6 @@ class TestCommand(test): except Exception: pass - + - os.environ[u'PATH'] = u"%s:%s" % ( - os.path.abspath(build_scripts_cmd.build_dir), - os.environ.get(u'PATH')) - test.run(self) - - def run_tests(self): + + +diff --git a/testing/functional/__init__.py b/testing/functional/__init__.py +index 4221576d..3cf44945 100644 --- a/testing/functional/__init__.py +++ b/testing/functional/__init__.py -@@ -107,7 +107,7 @@ class FunctionalTestCase(DuplicityTestCase): - if basepython is not None: - cmd_list.extend([basepython]) +@@ -111,7 +111,7 @@ class FunctionalTestCase(DuplicityTestCase): + run_coverage = os.environ.get(u'RUN_COVERAGE', None) + if run_coverage is not None: cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"]) -- cmd_list.extend([u"../bin/duplicity"]) +- cmd_list.extend([u"{0}/bin/duplicity".format(_top_dir)]) + cmd_list.extend([u"duplicity"]) cmd_list.extend(options) cmd_list.extend([u"-v0"]) cmd_list.extend([u"--no-print-statistics"]) +diff --git a/testing/functional/test_log.py b/testing/functional/test_log.py +index 9dfc86a6..b9cb55db 100644 --- a/testing/functional/test_log.py +++ b/testing/functional/test_log.py -@@ -47,9 +47,9 @@ class LogTest(FunctionalTestCase): +@@ -49,9 +49,9 @@ class LogTest(FunctionalTestCase): # Run actual duplicity command (will fail, because no arguments passed) basepython = os.environ.get(u'TOXPYTHON', None) if basepython is not None: -- os.system(u"{} ../bin/duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) -+ os.system(u"{} duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) +- os.system(u"{0} {1}/bin/duplicity --log-file={2} >/dev/null 2>&1".format(basepython, _top_dir, self.logfile)) ++ os.system(u"{0} duplicity --log-file={1} >/dev/null 2>&1".format(basepython, self.logfile)) else: -- os.system(u"../bin/duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) -+ os.system(u"duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) +- os.system(u"{0}/bin/duplicity --log-file={1} >/dev/null 2>&1".format(_top_dir, self.logfile)) ++ os.system(u"duplicity --log-file={0} >/dev/null 2>&1".format(self.logfile)) # The format of the file should be: # """ERROR 2 +diff --git a/testing/functional/test_rdiffdir.py b/testing/functional/test_rdiffdir.py +index 0cbfdb33..47acd029 100644 --- a/testing/functional/test_rdiffdir.py +++ b/testing/functional/test_rdiffdir.py -@@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase): +@@ -44,7 +44,7 @@ class RdiffdirTest(FunctionalTestCase): basepython = os.environ.get(u'TOXPYTHON', None) if basepython is not None: cmd_list.extend([basepython]) -- cmd_list.extend([u"../bin/rdiffdir"]) +- cmd_list.extend([u"{0}/bin/rdiffdir".format(_top_dir)]) + cmd_list.extend([u"rdiffdir"]) cmd_list.extend(argstring.split()) cmdline = u" ".join([u'"%s"' % x for x in cmd_list]) diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index c167ad1fa01..fa2f69bb3ef 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stringcase +, pytest-cov, pytest-runner, lib, stringcase }: buildPythonApplication rec { @@ -15,11 +15,11 @@ buildPythonApplication rec { hypothesis mypy pytest - pytestcov + pytest-cov ]; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index af0cbc4fe22..dfac5af0980 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic }: @@ -11,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -24,8 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = '' - rm BUILD + rm BUILD - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -53,10 +56,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; - + homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; - longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index ac0c0544f01..93b715f853c 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,30 +1,31 @@ -{ lib, stdenv, fetchurl, openmp ? null }: +{ lib, stdenv, fetchFromGitHub, openmp }: stdenv.mkDerivation rec { pname = "bsc"; version = "3.1.0"; - src = fetchurl { - url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz"; - sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6"; + src = fetchFromGitHub { + owner = "IlyaGrebnov"; + repo = "libbsc"; + rev = version; + sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz"; }; enableParallelBuilding = true; buildInputs = lib.optional stdenv.isDarwin openmp; - prePatch = '' + postPatch = '' substituteInPlace makefile \ --replace 'g++' '$(CXX)' ''; - preInstall = '' - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; + maintainers = with maintainers; [ ]; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 8b5dfe919c7..8f8818781ab 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { cp bspatch.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "An efficient binary diff/patch tool"; - homepage = "http://www.daemonology.net/bsdiff"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + homepage = "https://www.daemonology.net/bsdiff/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 07b6a5979a4..0dd703035fa 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { - pname = "dejsonlz4"; - version = "1.1"; - src = fetchFromGitHub { - owner = "avih"; - repo = pname; - rev = "v${version}"; - sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; - }; + pname = "dejsonlz4"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "avih"; + repo = pname; + rev = "v${version}"; + sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; + }; - buildPhase = '' - ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c - ''; + buildPhase = '' + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ''; - installPhase = '' - mkdir -p $out/bin/ - cp dejsonlz4 $out/bin/ - ''; + installPhase = '' + mkdir -p $out/bin/ + cp dejsonlz4 $out/bin/ + ''; - meta = with lib; { - description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = "https://github.com/avih/dejsonlz4"; - license = licenses.bsd2; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; - }; - } + meta = with lib; { + description = "Decompress Mozilla Firefox bookmarks backup files"; + homepage = "https://github.com/avih/dejsonlz4"; + license = licenses.bsd2; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 18efc1b64c2..664c1eb7856 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gzrt-0.8"; + pname = "gzrt"; + version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -15,10 +16,11 @@ stdenv.mkDerivation rec { cp gzrecover $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 73931f6bcae..9072a24b7fb 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,25 +1,26 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "kzipmix-20091108"; +stdenv.mkDerivation rec { + pname = "kzipmix"; + version = "20200115"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; - sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; + sha256 = "sha256-ePgye0D6/ED53zx6xffLnYhkjed7SPU4BLOZQr9E3yA="; }; installPhase = '' mkdir -p $out/bin - cp kzip zipmix $out/bin + cp amd64/{kzip,zipmix} $out/bin patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; - meta = { + meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = lib.licenses.unfree; + license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index ad36ebb81de..6d4017ac62c 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { + pname = "lbzip2"; version = "2.5"; - name = "lbzip2-${version}"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; rev = "v${version}"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; buildInputs = [ gnulib perl ]; diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index 77df84879b8..4f1ba702831 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,21 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lhasa"; + version = "0.3.1"; -stdenv.mkDerivation { - name = "lhasa-0.3.1"; src = fetchurl { - url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; + url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; - meta = { + + meta = with lib; { description = "Free Software replacement for the Unix LHA tool"; longDescription = '' Lhasa is a Free Software replacement for the Unix LHA tool, for decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = lib.licenses.isc; + license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with lib; [ maintainers.sander ]; - platforms = with lib.platforms; linux ++ darwin; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 820389300e3..02f62c3e3c0 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: +{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }: stdenv.mkDerivation rec { - version = "0.641"; pname = "lrzip"; + version = "0.641"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = { + meta = with lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index be31048c218..8bf58d9cc35 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, lzo}: +{ lib, stdenv, fetchurl, lzo }: stdenv.mkDerivation rec { - name = "lzop-1.04"; + pname = "lzop"; + version = "1.04"; + src = fetchurl { - url = "https://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.lzop.org"; description = "Fast file compressor"; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index a4cdcc08549..6dbe190c400 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,36 +1,34 @@ { lib, stdenv, fetchurl, zlib, util-linux }: -let name = "pigz"; - version = "2.6"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pigz"; + version = "2.6"; src = fetchurl { - url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; - buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; - installPhase = - '' - install -Dm755 pigz "$out/bin/pigz" - ln -s pigz "$out/bin/unpigz" - install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" - ln -s pigz.1 "$out/share/man/man1/unpigz.1" - install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + installPhase = '' + install -Dm755 pigz "$out/bin/pigz" + ln -s pigz "$out/bin/unpigz" + install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" + ln -s pigz.1 "$out/share/man/man1/unpigz.1" + install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; meta = with lib; { - homepage = "http://www.zlib.net/pigz/"; + homepage = "https://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; + maintainers = with maintainers; [ ]; license = licenses.zlib; platforms = platforms.unix; }; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index bb504e85f61..ec05a44a518 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,25 +1,42 @@ -{ - lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, xz +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, asciidoc +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, libarchive +, xz }: + stdenv.mkDerivation rec { - baseName = "pixz"; + pname = "pixz"; version = "1.0.7"; - name = "${baseName}-${version}"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl - libarchive xz + autoconf + automake + libtool + asciidoc + libxslt + libxml2 + docbook_xml_dtd_45 + docbook_xsl + libarchive + xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" ''; src = fetchFromGitHub { owner = "vasi"; - repo = baseName; + repo = pname; rev = "v${version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; @@ -27,10 +44,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "A parallel compressor/decompressor for xz format"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.bsd2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147..00000000000 --- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev <pashev.igor@gmail.com> -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index eb1f5d3570b..4ea95a3f78a 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,21 +1,18 @@ -{ lib, stdenv, fetchgit, xz }: +{ lib, stdenv, fetchFromGitHub, xz }: -let name = "pxz"; - version = "4.999.9beta+git"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pxz"; + version = "4.999.9beta+git"; - src = fetchgit { - url = "https://github.com/jnovy/pxz.git"; - rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; - sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + src = fetchFromGitHub { + owner = "jnovy"; + repo = "pxz"; + rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; + sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; }; buildInputs = [ xz ]; - patches = [ ./_SC_ARG_MAX.patch ]; - buildPhase = '' gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ @@ -30,15 +27,18 @@ stdenv.mkDerivation { cp pxz.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [pashev]; - description = ''Parallel XZ is a compression utility that takes advantage of + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pashev ]; + description = "compression utility that runs LZMA compression of different parts on multiple cores simultaneously"; + longDescription = '' + Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence - on compression ratio''; - platforms = with lib.platforms; linux; + on compression ratio + ''; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 60364afa9f3..5f878f8c494 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, fetchpatch, bzip2}: +{ lib, stdenv, fetchurl, fetchpatch, bzip2 }: + +stdenv.mkDerivation rec { + pname = "rzip"; + version = "2.1"; -stdenv.mkDerivation { - name = "rzip-2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-2.1.tar.gz"; + url = "mirror://samba/rzip/rzip-${version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -16,10 +18,11 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with lib; { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 94921397e30..b92112a4816 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zsync-0.6.2"; + pname = "zsync"; + version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; - meta = { + meta = with lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index aad633f3ba4..158c7d59399 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.12.1"; + version = "5.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-lQhG/qRU+0scOfD6RUmDZEVy35HfXAYEezNb8tVHN1k="; + sha256 = "sha256-Tikh0iA9Jl4qlBu9brB37dXjmBHi1p6MEbLwPc9eWEM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 03e76e5fb27..b5b1256a9b5 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytestcov mock ]; + checkInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 4618a9b3b79..f82b008e41d 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.31"; + version = "4.0.33"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak"; + sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w"; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 8661740d807..cb4f3820bcc 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq"; + sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 6a6409ad325..bf141c8d94d 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; + dontBuild = true; patchPhase = '' sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index 79a24ed3841..a22f402b5d1 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "ditaa-0.11.0"; + pname = "ditaa"; + version = "0.11.0"; src = fetchurl { - url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar"; + url = "https://github.com/stathissideris/ditaa/releases/download/v${version}/ditaa-${version}-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + mkdir -p $out/bin $out/lib cp ${src} "$out/lib/ditaa.jar" diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 37b398ef1c6..d12a213a31e 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.7"; + version = "2.9.8"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; + sha256 = "sha256-GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix new file mode 100644 index 00000000000..ba07e2886b5 --- /dev/null +++ b/pkgs/tools/graphics/lsix/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }: + +stdenvNoCC.mkDerivation rec { + pname = "lsix"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "hackerb9"; + repo = pname; + rev = version; + sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 lsix -t $out/bin + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/lsix \ + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} + ''; + + meta = with lib; { + description = "Shows thumbnails in terminal using sixel graphics"; + homepage = "https://github.com/hackerb9/lsix"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ kidonng ]; + }; +} diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 0a053a3ad32..a5475dbfba1 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation { done ''; - enableParallelBuilding = true; - # Inspired by install/linux-install/nifskope.spec.in. installPhase = '' runHook preInstall diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index acb2d41e045..aaef2dd2d08 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; + sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 258ab93689b..18fc21e9808 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj"; + sha256 = "sha256-2k7JtLr+zO71rbTz11CCiIPx+orn0dw/Y8m47WfRDEU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 35b3b1e336d..ad18becfc72 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -3,23 +3,17 @@ stdenv.mkDerivation rec { pname = "interception-tools"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitLab { owner = "interception/linux"; repo = "tools"; rev = "v${version}"; - sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj"; + sha256 = "0wcmppa7092b33wb8vc782day5phf90pc25cn1x7rk0rlw565z36"; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev udev libyamlcpp boost ]; - prePatch = '' - substituteInPlace CMakeLists.txt --replace \ - '"/usr/include/libevdev-1.0"' \ - "\"$(pkg-config --cflags libevdev | cut -c 3-)\"" - ''; - meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 69a74e465c9..1654b008aa5 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "android-tools"; - version = "31.0.0p1"; + version = "31.0.2"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - sha256 = "1dn7v10gdx1pi0pkddznd5sdz941qz0x4jww8h2mk50nbyxc792i"; + sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ="; }; nativeBuildInputs = [ cmake perl go ]; diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/tools/misc/bitwise/default.nix new file mode 100644 index 00000000000..a7ae6243f45 --- /dev/null +++ b/pkgs/tools/misc/bitwise/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "bitwise"; + version = "0.42"; + + src = fetchFromGitHub { + owner = "mellowcandle"; + repo = "bitwise"; + rev = "v${version}"; + sha256 = "154y0sn3z64z56k84ghsazkyihbkaz40hfwxcxdymnhvhh6m9f3g"; + }; + + buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Terminal based bitwise calculator in curses"; + homepage = "https://github.com/mellowcandle/bitwise"; + license = licenses.gpl3Only; + maintainers = [ maintainers.whonore ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index a3f1608c3ad..f71d8a8b8ef 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest pytestcov ]; + buildInputs = [ httpretty pytest pytest-cov ]; preCheck = '' # fix compatibility with pytest 4 diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index a0aed739c2a..fd289f9cfb8 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU="; + sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA="; }; vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 560ad460471..cc2d979ca75 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s="; + sha256 = "sha256-eCHmMtndcQJqKmjxhkcLvjMUXApkSnH+7qyG7PDfcwo="; }; - cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s="; + cargoSha256 = "sha256-wKCANWznOJMlQ8T2q39NNNRmgPYMpbkJhXpxojusNsE="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index a4b2b888fae..88a9846e835 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec { "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" + "test_obj_no_differences" ]; meta = with lib; { diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d097beca911..0c3d319f2a7 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }: rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.1"; + version = "2.14.2"; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so="; + sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4="; + cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; doCheck = false; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 97b98eea4f9..85055ccba5e 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-15n8CpyyC41oJRrFlNHYXF5UjOyYPX93Zrq7jcU2DVM="; + sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-rqNj3EwszSIn2cMmslO6T3K5NxQJ9u56m37TU1GwtVI="; + cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms="; doCheck = false; diff --git a/pkgs/tools/misc/elfcat/Cargo.lock b/pkgs/tools/misc/elfcat/Cargo.lock index e6c694bffb3..c5b48135993 100644 --- a/pkgs/tools/misc/elfcat/Cargo.lock +++ b/pkgs/tools/misc/elfcat/Cargo.lock @@ -4,4 +4,4 @@ version = 3 [[package]] name = "elfcat" -version = "0.1.3" +version = "0.1.4" diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index 38b1cc9b64f..a9691e43c6a 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-s56FyRoD2IhgdwEV63jMaB265CodHUlvmrWzmXAmonY="; + sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 1dbb5199f75..3e5a348c582 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "7e0e12afa45ef5ed8025e5f2c6deea0ff5f512644a721f7b1b95b63406a8f7ce"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index a701fbd73b5..beaffadab97 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210623.0"; + version = "20210719.0"; src = fetchPypi { inherit pname version; - sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77"; + sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 37c37de8399..69a67a6e918 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.19.4"; + version = "1.20.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2"; + sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4="; }; patches = [ @@ -36,12 +36,6 @@ with python.pkgs; buildPythonApplication rec { # drop coverage testing sed -i '/--cov/d' pytest.ini - - # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1 - # https://github.com/esphome/issues/issues/2021 - substituteInPlace tests/unit_tests/strategies.py --replace \ - "@st.defines_strategy_with_reusable_values" \ - "@st.defines_strategy(force_reusable_values=True)" ''; # Remove esptool and platformio from requirements diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 7c7f91621b8..3fc6e96e228 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln"; + sha256 = "sha256-GaGrV8L//pU4kt4HJmY88l5BNtT0IcZox7b24AFjPCI="; }; checkInputs = with python3.pkgs; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 9bda86db9bf..d0fae336d9d 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -10,7 +10,7 @@ let sha256 = { - "x86_64-linux" = "sha256-nGIUOS4LzfeXamcT0uigbQsVkULH2R3bli0DDEpg3ns="; + "x86_64-linux" = "sha256-FRZTUOlOK1bIbrHdR9yQv45zMhby3tWbMPpaPPq3L9s="; "i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1"; }."${stdenv.system}"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.120"; + version = "1.5.121"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix index db4330e5b0f..7124e907845 100644 --- a/pkgs/tools/misc/fcp/default.nix +++ b/pkgs/tools/misc/fcp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fcp"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "svetlitski"; repo = pname; rev = "v${version}"; - sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; - cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4"; + cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9"; nativeBuildInputs = [ expect ]; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 93e13996f7f..4ed308643e5 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.20"; + version = "0.1.21"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2CzpPzUylzDiP9rbjneRR6joa9UEgnDfJ4Ffa/orhkk="; + sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w="; }; - cargoSha256 = "sha256-xDh7SF73Qnx/GeW43JDmF+qeljSHbWWq4unWdTmAO+c="; + cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE="; doInstallCheck = true; diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 70d0eb19ca8..6ee4698d750 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/bash-completion/completions cp gibo $out/bin diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index f661f2cf97d..08e4641fb4c 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gparted"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz"; - sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo="; + sha256 = "sha256-Xu4ubXSxXvlrE7OiMQyGjtIpjgM0ECHn0SpamKHR4Qk="; }; # Tries to run `pkexec --version` to get version. diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index 83d8a770419..95b53c3b6cc 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' install -Dm +x $src $out/bin/ix diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index fb69610e4ef..73d86e7dfc6 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { stripRoot = false; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper libGLU libGL diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 2cfbf5ae91a..1d15db02040 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontBuild = true; installPhase = '' make PREFIX="$out" install diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 113c2b05ff5..b27aa32481c 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }: -stdenv.mkDerivation { - name = "ponysay-3.0.3"; +stdenv.mkDerivation rec { + name = "ponysay"; + version = "3.0.3"; - src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; - sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; + src = fetchFromGitHub { + owner = "erkin"; + repo = "ponysay"; + rev = version; + sha256 = "sha256-R2B0TU3ZSEncGsijKgvhaHIbcZa5Dx/jVPxrILBaoVw="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 texinfo ]; + buildInputs = [ python3 texinfo ]; inherit python3; - phases = "unpackPhase installPhase fixupPhase"; - installPhase = '' find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g" substituteInPlace setup.py --replace \ @@ -25,11 +26,11 @@ stdenv.mkDerivation { --with-bash ''; - meta = { + meta = with lib; { description = "Cowsay reimplemention for ponies"; homepage = "https://github.com/erkin/ponysay"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ bodil ]; - platforms = with lib.platforms; unix; + license = licenses.gpl3; + maintainers = with maintainers; [ bodil ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/poweralertd/default.nix b/pkgs/tools/misc/poweralertd/default.nix index a00a5b9a402..4121b0712bd 100644 --- a/pkgs/tools/misc/poweralertd/default.nix +++ b/pkgs/tools/misc/poweralertd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "poweralertd"; - version = "0.1.0"; + version = "0.2.0"; outputs = [ "out" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "~kennylevinsen"; repo = "poweralertd"; rev = version; - sha256 = "136xcrp7prilh905a6v933vryqy20l7nw24ahc4ycax8f0s906x9"; + sha256 = "19rw9q4pcqw56nmzjfglfikzx5wwjl4n08awwdhg0jy1k0bm3dvp"; }; patchPhase = '' diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2f6ff216dc8..004bebaebbe 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.21.0"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE="; + rev = "f27435b26b5001c52ffb1aee454572c59494c81b"; + sha256 = "sha256-YB/WMprjXA5ZN6baT5nWahNj0xwbP8kzS7X/1tCwWiE="; }; vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index e98323b75ee..783bb9b5a38 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }: stdenv.mkDerivation rec { - name = "pws-${(import ./gemset.nix).pws.version}"; + pname = "pws"; + version = (import ./gemset.nix).pws.version; nativeBuildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-gems"; inherit ruby; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 5b88030849d..00d46de8f96 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -20,8 +20,6 @@ mkDerivation rec { "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Qt5 Configuration Tool"; homepage = "https://www.opendesktop.org/content/show.php?content=168066"; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 1781187481f..aafdfe07ff9 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "system-config-printer"; - version = "1.5.12"; + version = "1.5.15"; src = fetchFromGitHub { owner = "openPrinting"; repo = pname; - rev = version; - sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf"; + rev = "v${version}"; + sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc"; }; prePatch = '' @@ -26,17 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104 - # (Fixes will be included in next upstream release.) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch"; - sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n"; - }) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch"; - sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23"; - }) ]; buildInputs = [ @@ -55,6 +44,10 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + preConfigure = '' + intltoolize --copy --force --automake + ''; + configureFlags = [ "--with-udev-rules" "--with-udevdir=${placeholder "out"}/etc/udev" diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index e6fc7bf3f7f..d9c9ad0451b 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, callPackage }: buildGoModule rec { pname = "tfk8s"; - version = "0.1.4"; + version = "0.1.5"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao="; + sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ="; }; - vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; + vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; buildFlagsArray = [ @@ -30,6 +30,10 @@ buildGoModule rec { $out/bin/tfk8s --version | grep ${tag} > /dev/null ''; + passthru.tests = { + sample1 = callPackage ./tests/sample1 { }; + }; + meta = with lib; { description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format"; license = licenses.mit; diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/pkgs/tools/misc/tfk8s/tests/sample1/default.nix new file mode 100644 index 00000000000..6b06dbf3234 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/tests/sample1/default.nix @@ -0,0 +1,11 @@ +{ runCommandCC, tfk8s }: + +runCommandCC "tfk8s-test-sample1" { + buildInputs = [ + tfk8s + ]; + meta.timeout = 60; + } + '' + cmp <(${tfk8s}/bin/tfk8s -f ${./input.yaml}) ${./output.tf} > $out + '' diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml new file mode 100644 index 00000000000..58ed0eb11d7 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: test +data: + TEST: test diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/pkgs/tools/misc/tfk8s/tests/sample1/output.tf new file mode 100644 index 00000000000..51d564400b5 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/tests/sample1/output.tf @@ -0,0 +1,12 @@ +resource "kubernetes_manifest" "configmap_test" { + manifest = { + "apiVersion" = "v1" + "data" = { + "TEST" = "test" + } + "kind" = "ConfigMap" + "metadata" = { + "name" = "test" + } + } +} diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 8a96248e718..9959fe9375b 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,28 +5,21 @@ buildGoModule rec { pname = "trillian"; - version = "1.3.11"; - vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; + version = "1.3.13"; + vendorSha256 = "1ad0vaw0k57njzk9x233iqjbplyvw66qjk8r9j7sx87pdc6a4lpb"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1lh19wba90y91l5jj8ilzjqxgmqqqdvyn7pzrwvmzv7iiy18wcmh"; + sha256 = "1ns394yd4js9g1psd1dkrffidyzixqvjp5lhw2x2iycrxbnm3y44"; }; - # Remove tests that require networking - postPatch = '' - rm cmd/get_tree_public_key/main_test.go - ''; - subPackages = [ "cmd/trillian_log_server" "cmd/trillian_log_signer" - "cmd/trillian_map_server" "cmd/createtree" "cmd/deletetree" - "cmd/get_tree_public_key" "cmd/updatetree" ]; diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index f69955020c7..d5dd47e0f66 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -27,7 +27,8 @@ let in mkDerivation { name = "${src.name}-patched"; inherit src; - phases = [ "unpackPhase" "patchPhase" ]; + + dontInstall = true; patchPhase = with lib; '' # we don’t want prebuild binaries checked into version control! diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 2900a64299f..c8d38d826d1 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.3"; + version = "0.4"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-hUwVp2tpKelbISQU/Q30yUeQfWp56dtgtfF/rpq1h5M="; + sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index 8dad93d0deb..5a082184400 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yafetch"; - version = "unstable-2021-06-15"; + version = "unstable-2021-07-18"; src = fetchFromGitLab { owner = "cyberkitty"; repo = pname; - rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3"; - sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99"; + rev = "f3efbca54df1ffea22cc40034114af141ccff9c1"; + sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw"; }; # Use the provided NixOS logo automatically diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index cd04e2020b1..209072da3b0 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -12,12 +12,12 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg future lxml requests + attrs configargparse ffmpeg future lxml requests ]; pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index d55353682fd..c7889b15873 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-1GG3Bvw3P77dLhvJKwq48TUWMwg+bDgzWmtrw2JixLg="; + sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; }; - cargoSha256 = "sha256-cqm4QCGy6eTKtEBlE2ihmh93eO7d47zlCrLY8Gp0dxM="; + cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 184ba0862c5..5d539cc5697 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY="; + sha256 = "0zlkr0r06w3y34nx174wyfwk69i2q0bcq88kfvb0j3d28fdh5p31"; }; - vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8="; + vendorSha256 = "065n1vhj5003ay4pflp418w32s84jvza52lghj6cpcdzs0rwgc45"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/tools/networking/cdpr/default.nix new file mode 100644 index 00000000000..6ac69b95dba --- /dev/null +++ b/pkgs/tools/networking/cdpr/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + pname = "cdpr"; + version = "2.4"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz"; + sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj"; + }; + + buildInputs = [ libpcap ]; + + installPhase = '' + install -Dm755 cdpr $out/bin/cdpr + ''; + + meta = with lib; { + description = "Cisco Discovery Protocol Reporter"; + homepage = "http://cdpr.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.sgo ]; + }; +} diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index aa61d42d3d0..fb50316f713 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -15,8 +15,6 @@ mkDerivation rec { buildInputs = [ qtbase ]; - enableParallelBuilding = true; - postPatch = '' for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do substituteInPlace $f --replace /etc $out/etc --replace /usr $out diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 341e1c13335..8ba8109f266 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y"; + sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k"; }; - vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck"; + vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw"; doCheck = false; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 96528a78d4c..ffa2138ffa8 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.2"; + version = "0.38.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v2uVIFPc8h58W03Jo2vsbLT5f7F8bJw4uMtSErrBYdo="; + sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/tools/networking/iwgtk/default.nix new file mode 100644 index 00000000000..5c89facd3fa --- /dev/null +++ b/pkgs/tools/networking/iwgtk/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub, gtk3, lib, pkg-config, stdenv }: + +stdenv.mkDerivation rec { + pname = "iwgtk"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "j-lentz"; + repo = pname; + rev = "v${version}"; + sha256 = "129h7vq9b1r9a5c79hk8d06bj8lgzrnhq55x54hqri9c471jjh0s"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "Lightweight, graphical wifi management utility for Linux"; + homepage = "https://github.com/j-lentz/iwgtk"; + changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 05da924c47e..480321ad15f 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ - ConfigArgParse + configargparse argcomplete beautifulsoup4 pyopenssl diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 8e3d0cf9160..6632485b709 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -7,9 +7,10 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "maphosts-${env.gems.maphosts.version}"; + pname = "maphosts"; + version = env.gems.maphosts.version; - phases = ["installPhase"]; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 70b663edded..06ec1b5a83f 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-03-23T05-46-11Z"; + version = "2021-06-13T17-48-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4="; + sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U="; }; - vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ="; - - doCheck = false; + vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg="; subPackages = [ "." ]; @@ -23,10 +21,15 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/mc --version | grep ${version} > /dev/null + ''; + meta = with lib; { homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = with maintainers; [ eelco bachp ]; + maintainers = with maintainers; [ bachp eelco superherointj ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 4f3b7a3204d..94d9dff1f84 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,20 +1,64 @@ -{ lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala -, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit -, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt -, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 -, openconnect, curl, meson, ninja, libpsl, mobile-broadband-provider-info, runtimeShell }: +{ lib +, stdenv +, fetchurl +, substituteAll +, intltool +, pkg-config +, fetchpatch +, dbus +, gnome +, systemd +, libuuid +, polkit +, gnutls +, ppp +, dhcp +, iptables +, nftables +, python3 +, vala +, libgcrypt +, dnsmasq +, bluez5 +, readline +, libselinux +, audit +, gobject-introspection +, modemmanager +, openresolv +, libndp +, newt +, libsoup +, ethtool +, gnused +, iputils +, kmod +, jansson +, gtk-doc +, libxslt +, docbook_xsl +, docbook_xml_dtd_412 +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, openconnect +, curl +, meson +, ninja +, libpsl +, mobile-broadband-provider-info +, runtimeShell +}: let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.30.4"; + version = "1.32.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-YFC3JCEuo85zhhEzWb6pr6H2eaVPYNmZpZmYkuZywZA="; + sha256 = "sha256-Kay9QceLfvh/+I/sU2DR6vi1tvy5BVXXORq8XjaSMVg="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -23,34 +67,46 @@ in stdenv.mkDerivation rec { # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. mesonFlags = [ - "-Ddhclient=${dhcp}/bin/dhclient" - "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" - # Upstream prefers dhclient, so don't add dhcpcd to the closure - "-Ddhcpcd=no" - "-Ddhcpcanon=no" - "-Dpppd=${ppp}/bin/pppd" - "-Diptables=${iptables}/bin/iptables" + # System paths + "--sysconfdir=/etc" + "--localstatedir=/var" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" # to enable link-local connections "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dresolvconf=${openresolv}/bin/resolvconf" "-Ddbus_conf_dir=${placeholder "out"}/share/dbus-1/system.d" - "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "-Dkernel_firmware_dir=/run/current-system/firmware" - "--sysconfdir=/etc" - "--localstatedir=/var" - "-Dcrypto=gnutls" + + # Platform "-Dsession_tracking=systemd" - "-Dmodem_manager=true" - "-Dnmtui=true" - "-Ddocs=true" - "-Dtests=no" - "-Dqt=false" + "-Dlibaudit=yes-disabled-by-default" "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1" + + # Features # Allow using iwd when configured to do so "-Diwd=true" - "-Dlibaudit=yes-disabled-by-default" + "-Dpppd=${ppp}/bin/pppd" + "-Diptables=${iptables}/bin/iptables" + "-Dnft=${nftables}/bin/nft" + "-Dmodem_manager=true" + "-Dnmtui=true" + "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" + "-Dqt=false" + + # Handlers + "-Dresolvconf=${openresolv}/bin/resolvconf" + + # DHCP clients + "-Ddhclient=${dhcp}/bin/dhclient" + # Upstream prefers dhclient, so don't add dhcpcd to the closure + "-Ddhcpcd=no" + "-Ddhcpcanon=no" + + # Miscellaneous + "-Ddocs=true" # We don't use firewalld in NixOS "-Dfirewalld_zone=false" + "-Dtests=no" + "-Dcrypto=gnutls" ]; patches = [ @@ -66,17 +122,44 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - systemd libselinux audit libpsl libuuid polkit ppp libndp curl mobile-broadband-provider-info - bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson + systemd + libselinux + audit + libpsl + libuuid + polkit + ppp + libndp + curl + mobile-broadband-provider-info + bluez5 + dnsmasq + gobject-introspection + modemmanager + readline + newt + libsoup + jansson ]; propagatedBuildInputs = [ gnutls libgcrypt ]; nativeBuildInputs = [ - meson ninja intltool pkg-config - vala gobject-introspection dbus + meson + ninja + intltool + pkg-config + vala + gobject-introspection + dbus # Docs - gtk-doc libxslt docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs + gtk-doc + libxslt + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + pythonForDocs ]; doCheck = false; # requires /sys, the net @@ -92,7 +175,7 @@ in stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p ${placeholder "out"}/lib - ln -s $PWD/libnm/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 + ln -s $PWD/src/libnm-client-impl/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 ''; passthru = { @@ -107,7 +190,8 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]); + changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; + maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz maxeaubrey ]); platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index cb9d3c3a0d2..8c7c4b2fa4d 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -1,26 +1,5 @@ -diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 15c47c3ec..4d1913aa6 100644 ---- a/clients/common/nm-vpn-helpers.c -+++ b/clients/common/nm-vpn-helpers.c -@@ -208,15 +208,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host, - NULL, - }; - -- path = nm_utils_file_search_in_paths("openconnect", -- "/usr/sbin/openconnect", -- DEFAULT_PATHS, -- G_FILE_TEST_IS_EXECUTABLE, -- NULL, -- NULL, -- error); -- if (!path) -- return FALSE; -+ path = "@openconnect@/bin/openconnect"; - - if (!g_spawn_sync(NULL, - (char **) NM_MAKE_STRV(path, "--authenticate", host), diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules -index e398cb9f2..a43d61864 100644 +index e398cb9f2f..a43d61864f 100644 --- a/data/84-nm-drivers.rules +++ b/data/84-nm-drivers.rules @@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" @@ -32,7 +11,7 @@ index e398cb9f2..a43d61864 100644 LABEL="nm_drivers_end" diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 91ebd9a36..5201a56c3 100644 +index e23b3a5282..c7246a3b61 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ @@ -44,23 +23,11 @@ index 91ebd9a36..5201a56c3 100644 #ExecReload=/bin/kill -HUP $MAINPID ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure -diff --git a/libnm/meson.build b/libnm/meson.build -index d0846419c..a7adb2cc6 100644 ---- a/libnm/meson.build -+++ b/libnm/meson.build -@@ -280,7 +280,6 @@ if enable_introspection - output: 'nm-settings-docs-gir.xml', - command: [ - generate_setting_docs_env, -- python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 040dd0b4d..98aea3aa9 100644 +index 21863b9533..c9b709659d 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13957,14 +13957,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -13994,14 +13994,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_ip4_config_best_default_route_get(priv->ip_config_4); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -77,11 +44,31 @@ index 040dd0b4d..98aea3aa9 100644 log_domain = LOGD_IP6; } } -diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c -index 9075c30dd..4b140e92b 100644 ---- a/src/core/nm-core-utils.c -+++ b/src/core/nm-core-utils.c -@@ -333,7 +333,7 @@ nm_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *a +diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build +index 21a01e0b04..091c98428f 100644 +--- a/src/libnm-client-impl/meson.build ++++ b/src/libnm-client-impl/meson.build +@@ -162,7 +162,6 @@ if enable_introspection + input: libnm_core_settings_sources, + output: 'nm-propery-infos-' + info + '.xml', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), + info, + '@OUTPUT@', +@@ -219,7 +218,6 @@ if enable_introspection + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), + '--lib-path', meson.current_build_dir(), + '--gir', '@INPUT@', +diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c +index 6435dcc482..214d01194e 100644 +--- a/src/libnm-platform/nm-platform-utils.c ++++ b/src/libnm-platform/nm-platform-utils.c +@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new(4); @@ -90,3 +77,58 @@ index 9075c30dd..4b140e92b 100644 g_ptr_array_add(argv, "--use-blacklist"); g_ptr_array_add(argv, (char *) arg1); +diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c +index 72691e34c2..95495b6585 100644 +--- a/src/libnmc-base/nm-vpn-helpers.c ++++ b/src/libnmc-base/nm-vpn-helpers.c +@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, + gs_free const char **output_v = NULL; + const char *const * iter; + const char * path; +- const char *const DEFAULT_PATHS[] = { +- "/sbin/", +- "/usr/sbin/", +- "/usr/local/sbin/", +- "/bin/", +- "/usr/bin/", +- "/usr/local/bin/", +- NULL, +- }; + +- path = nm_utils_file_search_in_paths("openconnect", +- "/usr/sbin/openconnect", +- DEFAULT_PATHS, +- G_FILE_TEST_IS_EXECUTABLE, +- NULL, +- NULL, +- error); +- if (!path) +- return FALSE; ++ path = "@openconnect@/bin/openconnect"; + + if (!g_spawn_sync(NULL, + (char **) NM_MAKE_STRV(path, "--authenticate", host), +diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build +index 8f07ae634e..a1326b3403 100644 +--- a/src/libnmc-setting/meson.build ++++ b/src/libnmc-setting/meson.build +@@ -6,7 +6,6 @@ if enable_docs + input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], + output: 'settings-docs-input.xml', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'), + '@OUTPUT@', + nm_property_infos_xml['nmcli'], +diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build +index b2e455bbbd..a12ebf212a 100644 +--- a/src/tests/client/meson.build ++++ b/src/tests/client/meson.build +@@ -6,7 +6,6 @@ test( + args: [ + build_root, + source_root, +- python.path(), + ], + timeout: 120, + ) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index b195c655c93..34d2c22fb24 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 306654f05d9..33eb33e10b0 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 0c0bc370526..8d8069bec29 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -17,15 +17,13 @@ stdenv.mkDerivation rec { pname = "gtk-gnutella"; - # NOTE: Please remove hardeningDisable on the next release, see: - # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "gtk-gnutella"; repo = "gtk-gnutella"; rev = "v${version}"; - sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy"; + sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4="; }; nativeBuildInputs = [ @@ -54,8 +52,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (!enableGui) [ "--topless" ] ; - hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; - enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 36d156a3994..708932ac1c9 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,45 +1,37 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, libpcap +, openssl +}: stdenv.mkDerivation rec { - version = "2.4.8"; + version = "2.4.9"; pname = "ppp"; src = fetchFromGitHub { - owner = "paulusmack"; - repo = "ppp"; - rev = "ppp-${version}"; - sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"; + owner = "ppp-project"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-8+nbqRNfKPLDx+wmuKSkv+BSeG72hKJI4dNqypqeEK4="; }; - patches = - [ - ( substituteAll { - src = ./nix-purity.patch; - inherit libpcap; - glibc = stdenv.cc.libc.dev or stdenv.cc.libc; - openssl = openssl.dev; - }) - # Without nonpriv.patch, pppd --version doesn't work when not run as - # root. - ./nonpriv.patch - (fetchpatch { - name = "CVE-2015-3310.patch"; - url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch"; - sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; - }) - (fetchurl { - url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch"; - sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; - }) - (fetchpatch { - name = "CVE-2020-8597.patch"; - url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch"; - sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh"; - }) - ./musl-fix-headers.patch - ]; + patches = [ + (substituteAll { + src = ./nix-purity.patch; + glibc = stdenv.cc.libc.dev or stdenv.cc.libc; + openssl_dev = openssl.dev; + openssl_out = openssl.out; + }) + # Without nonpriv.patch, pppd --version doesn't work when not run as root. + ./nonpriv.patch + ]; - buildInputs = [ libpcap openssl ]; + buildInputs = [ + libpcap + openssl + ]; postPatch = '' # strip is not found when cross compiling with seemingly no way to point @@ -66,9 +58,14 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://ppp.samba.org/"; - description = "Point-to-point implementation for Linux and Solaris"; - license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; + homepage = "https://ppp.samba.org"; + description = "Point-to-point implementation to provide Internet connections over serial lines"; + license = with licenses; [ + bsdOriginal + publicDomain + gpl2 + lgpl2 + ]; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch deleted file mode 100644 index d6252a52675..00000000000 --- a/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h -index b06eda5..dafa36c 100644 ---- a/include/net/ppp_defs.h -+++ b/include/net/ppp_defs.h -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include <sys/time.h> -+ - /* - * The basic PPP frame. - */ -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index a74c914..7acd2cf 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -126,7 +126,7 @@ LIBS += -lcrypt - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - -diff --git a/pppd/magic.h b/pppd/magic.h -index c81213b..305aece 100644 ---- a/pppd/magic.h -+++ b/pppd/magic.h -@@ -42,6 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ - */ - -+#include <sys/cdefs.h> -+ - void magic_init (void); /* Initialize the magic number generator */ - u_int32_t magic (void); /* Returns the next magic number */ - -diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c -index 91e9a57..9c0fac3 100644 ---- a/pppd/plugins/rp-pppoe/if.c -+++ b/pppd/plugins/rp-pppoe/if.c -@@ -30,10 +30,6 @@ static char const RCSID[] = - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c -index a8c2bb4..ca34d79 100644 ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> - #include <linux/if_pppox.h> -diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c -index 3d3bf4e..b5f82d3 100644 ---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -27,10 +27,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -@@ -55,6 +51,8 @@ void die(int status) - exit(status); - } - -+#define error(x...) fprintf(stderr, x) -+ - /* Initialize frame types to RFC 2516 values. Some broken peers apparently - use different frame types... sigh... */ - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index c4aaa6e..70aef85 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t; - #include <linux/if_ether.h> - #endif - --#ifdef HAVE_NETINET_IF_ETHER_H --#include <sys/types.h> -- --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifndef HAVE_SYS_DLPI_H --#include <netinet/if_ether.h> --#endif --#endif -- -- - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 - #define ETH_PPPOE_SESSION 0x8864 -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 6d71530..86d224e 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if !defined(__GLIBC__) || __GLIBC__ >= 2 - #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ - #include <net/if.h> - #include <net/if_arp.h> - #include <net/route.h> - #include <netinet/if_ether.h> --#else --#include <linux/types.h> --#include <linux/if.h> --#include <linux/if_arp.h> --#include <linux/route.h> --#include <linux/if_ether.h> --#endif - #include <netinet/in.h> - #include <arpa/inet.h> - diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/tools/networking/ppp/nix-purity.patch index 975ea9db609..c3363e0ccb6 100644 --- a/pkgs/tools/networking/ppp/nix-purity.patch +++ b/pkgs/tools/networking/ppp/nix-purity.patch @@ -1,31 +1,33 @@ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 9664f70..d07e01e 100644 +index 22837c5..6f6fff5 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -125,7 +125,7 @@ CFLAGS += -DHAS_SHADOW +@@ -111,8 +111,8 @@ endif + + # EAP SRP-SHA1 + ifdef USE_SRP +-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include +-LIBS += -lsrp -L/usr/local/ssl/lib ++CFLAGS += -DUSE_SRP -DOPENSSL -I@openssl_dev@/include/openssl ++LIBS += -lsrp -L@openssl_out@/lib + NEEDCRYPTOLIB = y + TARGETS += srp-entry + EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry +@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) +-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) +ifneq ($(wildcard @glibc@/include/crypt.h),) CFLAGS += -DHAVE_CRYPT_H=1 - LIBS += -lcrypt + LIBS += -lcrypt endif -@@ -137,7 +137,7 @@ endif +@@ -155,7 +155,7 @@ endif ifdef NEEDDES ifndef USE_CRYPT -CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl -+CFLAGS += -I@openssl@/include/openssl - LIBS += -lcrypto ++CFLAGS += -I@openssl_dev@/include/openssl + NEEDCRYPTOLIB = y else CFLAGS += -DUSE_CRYPT=1 -@@ -188,7 +188,7 @@ LIBS += -ldl - endif - - ifdef FILTER --ifneq ($(wildcard /usr/include/pcap-bpf.h),) -+ifneq ($(wildcard @libpcap@/include/pcap-bpf.h),) - LIBS += -lpcap - CFLAGS += -DPPP_FILTER - endif diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index ebbaaa73fce..ddccc9ac635 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.13"; + version = "3.8.2"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw="; + sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 97c758e19b4..54de621763c 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.2.1"; + version = "2.3.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41"; + sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3"; }; - vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp"; + vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5"; buildFlagsArray = '' -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/tools/networking/userhosts/default.nix new file mode 100644 index 00000000000..6cec402638a --- /dev/null +++ b/pkgs/tools/networking/userhosts/default.nix @@ -0,0 +1,23 @@ +{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: + +stdenv.mkDerivation rec { + pname = "userhosts"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "figiel"; + repo = "hosts"; + rev = "v${version}"; + hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A"; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A libc wrapper providing per-user hosts file"; + homepage = "https://github.com/figiel/hosts"; + maintainers = [ maintainers.bobvanderlinden ]; + license = licenses.cc0; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index 734c6d9f4ec..776e8450d13 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , makeWrapper -, nettools, gawk, systemd, openresolv, coreutils, gnugrep +, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2 }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" '' + '' wrapProgram $out/bin/vpnc-script \ - --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}" + --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}" ''; meta = with lib; { diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 146165d880d..1d7fd6beb4a 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -1,24 +1,19 @@ { buildGoModule , fetchFromGitHub , lib - }: -let - pname = "nar-serve"; - version = "0.3.0"; - -in buildGoModule rec { - inherit pname version; + pname = "nar-serve"; + version = "0.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz"; + hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U="; }; - vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs"; + vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU="; doCheck = false; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index a755d933219..f9077ef1387 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -15,13 +15,20 @@ stdenv.mkDerivation { (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ])) ]; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; buildPhase = '' + runHook preBuild + mkdir -p $out/bin ghc -O2 $src/nix-script.hs -o $out/bin/nix-script -odir . -hidir . + + runHook postBuild ''; installPhase = '' + runHook preInstall + ln -s $out/bin/nix-script $out/bin/nix-scripti + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 662be6a0978..5936429c7a4 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -2,10 +2,7 @@ , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , gnugrep, gnused, jq, nix }: -let - binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "nix-prefetch"; version = "0.4.1"; @@ -55,7 +52,7 @@ in stdenv.mkDerivation rec { install -Dm555 -t $lib src/*.sh install -Dm444 -t $lib lib/* makeWrapper $lib/main.sh $out/bin/${pname} \ - --prefix PATH : ${binPath} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]} installManPage doc/nix-prefetch.? @@ -69,7 +66,7 @@ in stdenv.mkDerivation rec { description = "Prefetch any fetcher function call, e.g. package sources"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; - inherit (src.meta) homepage; + homepage = "https://github.com/msteen/nix-prefetch"; platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index f56222f403a..13c254cbee2 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitHub +, installShellFiles , makeWrapper , nix , openssl @@ -8,18 +9,24 @@ rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.1"; + version = "0.1.4"; src = fetchFromGitHub { + name = "${pname}-${version}-src"; owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk="; + sha256 = "sha256-kNFhSfHUYBUOCXoD6m7thMho4tOIpRHfHGcsW8FTgkc="; }; - cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0="; + cargoSha256 = "sha256-7PthFLCEt+E/Gx5//aulHYYBKZqapNEWKtKfRlDr3Pw="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; - nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -27,6 +34,11 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/nix-template \ --prefix PATH : ${lib.makeBinPath [ nix ]} + + installShellCompletion --cmd nix-template \ + --bash <($out/bin/nix-template completions bash) \ + --fish <($out/bin/nix-template completions fish) \ + --zsh <($out/bin/nix-template completions zsh) ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6ba5135fdd6..e60cf580426 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -193,38 +193,57 @@ common = preBuild = "unset NIX_INDENT_MAKE"; }); + inherit boehmgc; }; }; in nix; + boehmgc_nix = boehmgc.override { + enableLargeConfig = true; + }; + + boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: { + patches = (drv.patches or []) ++ [ + # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 + (fetchpatch { + url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff; + sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; + }) + ]; + }); + in rec { nix = nixStable; nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.12"; + version = "2.3.14"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10="; + sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nix; + + inherit storeDir stateDir confDir; }); nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210601_5985b8b"; + suffix = "pre20210707_02dd6bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; - sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; + rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; + sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nixUnstable; + + inherit storeDir stateDir confDir; }); diff --git a/pkgs/tools/security/cewl/Gemfile b/pkgs/tools/security/cewl/Gemfile new file mode 100644 index 00000000000..97d9ae757ac --- /dev/null +++ b/pkgs/tools/security/cewl/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' +gem 'mime' +gem 'mime-types', ">=3.3.1" +gem 'mini_exiftool' +gem 'nokogiri' +gem 'rexml' +gem 'rubyzip' +gem 'spider' diff --git a/pkgs/tools/security/cewl/Gemfile.lock b/pkgs/tools/security/cewl/Gemfile.lock new file mode 100644 index 00000000000..85bb2eb4b82 --- /dev/null +++ b/pkgs/tools/security/cewl/Gemfile.lock @@ -0,0 +1,31 @@ +GEM + remote: https://rubygems.org/ + specs: + mime (0.4.4) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0704) + mini_exiftool (2.10.2) + mini_portile2 (2.5.3) + nokogiri (1.11.7) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + racc (1.5.2) + rexml (3.2.5) + rubyzip (2.3.2) + spider (0.5.4) + +PLATFORMS + ruby + +DEPENDENCIES + mime + mime-types (>= 3.3.1) + mini_exiftool + nokogiri + rexml + rubyzip + spider + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/tools/security/cewl/default.nix new file mode 100644 index 00000000000..06d983c14e3 --- /dev/null +++ b/pkgs/tools/security/cewl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, bundlerEnv }: + +let + rubyEnv = bundlerEnv { + name = "cewl-ruby-env"; + gemdir = ./.; + }; +in +stdenv.mkDerivation rec { + pname = "cewl"; + version = "5.5.2"; + src = fetchFromGitHub { + owner = "digininja"; + repo = "CeWL"; + rev = version; + sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; + }; + + buildInputs = [ rubyEnv.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + cp *.rb $out/bin/ + mv $out/bin/cewl.rb $out/bin/cewl + ''; + + meta = with lib; { + description = "Custom wordlist generator"; + homepage = "https://digi.ninja/projects/cewl.php/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/tools/security/cewl/gemset.nix b/pkgs/tools/security/cewl/gemset.nix new file mode 100644 index 00000000000..851a6d2442d --- /dev/null +++ b/pkgs/tools/security/cewl/gemset.nix @@ -0,0 +1,104 @@ +{ + mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; + type = "gem"; + }; + version = "0.4.4"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + type = "gem"; + }; + version = "3.2021.0704"; + }; + mini_exiftool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ir4wigpm6nkd3f40wcjdqrhjx3l60w1hwcg143is1a95ypnvqhr"; + type = "gem"; + }; + version = "2.10.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + type = "gem"; + }; + version = "2.5.3"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + type = "gem"; + }; + version = "1.11.7"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + spider = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fix7zhnvlfqg66bxwdpbsffbynzdnaifnxpakn07bjh3rdj75cx"; + type = "gem"; + }; + version = "0.5.4"; + }; +} diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index bd558b7ab66..e0252dac820 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg"; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 2444d1f1d72..63f25bc12ef 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -61,7 +61,6 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [dpkg]; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; installPhase='' diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ba4844d9ed1..9509288b581 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-17"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg="; + sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams="; }; installPhase = '' diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 1bc0d77878c..b41f6bc67fc 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs="; + sha256 = "sha256-rrtPMCgp2Xe8LXzFN57rzay2kyPaLT1+2m1NZQ9EsW4="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "sha256-d6t/bvHpnH4lKv78tp/8DC/VrQBnaiZhnf8GrlcYhJw="; + cargoSha256 = "sha256-5CzQuzmKuEi4KTR1jNh4avwqA3qYzTj+rV/zbIeUjAM="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 68aa7c48819..228271742c6 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ patchelf makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; unpackCmd = '' mkdir gorilla; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index c04f885a91f..ad912aee839 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-WUD6KZdtMJ/nEbC5MStK8qWKK05lXuk8+VD741g448s="; + sha256 = "sha256-J1mdgcNWloQOnGdBjcCoAsv+ClQ77DXYQajM9B3sYHY="; }; - cargoSha256 = "sha256-uF9mbJ7Nd+JaoZN886NX8iRv8/LZSqYntoosyFzzAIs="; + cargoSha256 = "sha256-I63Pevw0BjkjasszZn2wmT4TNeVk27pJy4mJR6nl9MI="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 7df1090b2b0..c24515dd1bb 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fYeZFNtftG46/QHdV5UhCNCdP7ErOgwWfEB4V14ei5k="; + sha256 = "sha256-xiUDyuVNVkVT+kxOEFOq4RKxMc5nNjsom/ZTKzfkOhU="; }; vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc="; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 3f38493d752..273e2837e06 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "0xbs3i5g2w8h5031jwgm13algs3f721k12fghnwfzi05fmzw8d0f"; + sha256 = "sha256-wL4cZpPuHzXHvvH3m/njCpVPcX70LQDjd4eq7/MnHlE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 37af42e33cc..176cc5e706b 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 5c07add9056..00ff112ba84 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = srcs.richclient; - phases = "installPhase"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 22374e1d302..b86cb57bbde 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -1,18 +1,16 @@ { lib, stdenv, fetchurl, which }: -stdenv.mkDerivation { - name = "ossec-client-2.6"; +stdenv.mkDerivation rec { + pname = "ossec-client"; + version = "2.6"; src = fetchurl { - url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz"; - + url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz"; sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; }; buildInputs = [ which ]; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; - patches = [ ./no-root.patch ]; buildPhase = '' @@ -30,11 +28,12 @@ yes " | ./install.sh ''; - meta = { + meta = with lib; { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix new file mode 100644 index 00000000000..74c7996a896 --- /dev/null +++ b/pkgs/tools/security/quill/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, which, buildPackages }: + +rustPlatform.buildRustPackage rec { + pname = "quill"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dfinity"; + repo = "quill"; + rev = "v${version}"; + sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr"; + }; + + ic = fetchFromGitHub { + owner = "dfinity"; + repo = "ic"; + rev = "779549eccfcf61ac702dfc2ee6d76ffdc2db1f7f"; + sha256 = "1r31d5hab7k1n60a7y8fw79fjgfq04cgj9krwa6r9z4isi3919v6"; + }; + + registry = "file://local-registry"; + + preBuild = '' + export REGISTRY_TRANSPORT_PROTO_INCLUDES=${ic}/rs/registry/transport/proto + export IC_BASE_TYPES_PROTO_INCLUDES=${ic}/rs/types/base_types/proto + export IC_PROTOBUF_PROTO_INCLUDES=${ic}/rs/protobuf/def + export IC_NNS_COMMON_PROTO_INCLUDES=${ic}/rs/nns/common/proto + export PROTOC=${buildPackages.protobuf}/bin/protoc + export OPENSSL_DIR=${openssl.dev} + export OPENSSL_LIB_DIR=${openssl.out}/lib + ''; + + cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k"; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + + meta = with lib; { + homepage = "https://github.com/dfinity/quill"; + changelog = "https://github.com/dfinity/quill/releases/tag/v${version}"; + description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer."; + license = licenses.asl20; + maintainers = with maintainers; [ imalison ]; + }; +} diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index a40e2ce33c9..d84f6f29900 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { checkInputs = lib.optionals pythonSupport [ pythonPackages.pytest - pythonPackages.pytestrunner + pythonPackages.pytest-runner ]; buildInputs = [ diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index eec82712c8c..959712488a2 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -11,11 +11,11 @@ python3Packages.buildPythonApplication rec { pname = "sshuttle"; - version = "1.0.3"; + version = "1.0.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0fff1c88669a20bb6a4e7331960673a3a02a2e04ff163e4c9299496646edcf61"; + sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd"; }; patches = [ ./sudo.patch ]; @@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; + propagatedBuildInputs = [ python3Packages.psutil ]; + checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; postInstall = '' @@ -42,7 +44,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2.7, Python 3.5 or later at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; - license = licenses.gpl2; + license = licenses.lgpl21; maintainers = with maintainers; [ domenkozar carlosdagos ]; }; } diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 34407f5f5ad..61d10111120 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -1,28 +1,45 @@ -{ lib, stdenv, fetchurl, gmp }: +{ lib +, stdenv +, fetchFromGitHub +, gmp +, installShellFiles +}: -stdenv.mkDerivation { - name = "ssss-0.5"; +stdenv.mkDerivation rec { + pname = "ssss"; + version = "0.5.7"; - src = fetchurl { - url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz"; - sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx"; + src = fetchFromGitHub { + owner = "MrJoy"; + repo = pname; + rev = "releases%2Fv${version}"; + sha256 = "18r1hwch6nq6gjijavr4pvrxz2plrlrvdx8ssqhdj2vmqvlqwbvd"; }; - buildInputs = [ gmp ]; + nativeBuildInputs = [ + installShellFiles + ]; - preBuild = - '' - sed -e s@/usr/@$out/@g -i Makefile - cp ssss.manpage.xml ssss.1 - cp ssss.manpage.xml ssss.1.html - mkdir -p $out/bin $out/share/man/man1 - echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile - ''; + buildInputs = [ + gmp + ]; - meta = { + preBuild = '' + sed -e s@/usr/@$out/@g -i Makefile + cp ssss.manpage.xml ssss.1 + mkdir -p $out/bin + echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile + ''; + + postInstall = '' + installManPage ssss.1 + ''; + + meta = with lib; { description = "Shamir Secret Sharing Scheme"; homepage = "http://point-at-infinity.org/ssss/"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index a13eec71eb8..c91a83c0a0d 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,20 +5,27 @@ buildGoModule rec { pname = "step-cli"; - version = "0.15.16"; + version = "0.16.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I="; + sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I="; }; + ldflags = [ + "-w" + "-s" + "-X main.Version=${version}" + ]; + preCheck = '' # Tries to connect to smallstep.com rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM="; + + vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index d49c1e925dc..037adda92eb 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ freezegun pytest - pytestcov + pytest-cov pytest-flake8 ]; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 036410f350c..1401f2a78a9 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-QCi6Oi5xk88ev2B4rlXwgR55qKZSUbIY/96t/jhJQ0Q="; + sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-RJ7xIp9EBiBLSMAchr7XYhrTITNJy+Yfok//vZr3Z38="; + cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4="; doCheck = false; diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix index 378eb62d6cc..3867bd6bb3d 100644 --- a/pkgs/tools/system/collectd/data.nix +++ b/pkgs/tools/system/collectd/data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "collectd-data"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/share/collectd diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 547265196c6..c50b2a4c84e 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PByW1wj9B6aJhYZYPT1uUDUDVtZHGYC2ingvxdr8Gbc="; + sha256 = "sha256-hf5jTEAN5oOPg2PaAlYjIDMYcwXkaFAqPtWTwZV98N0="; }; vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 1cc0ba87739..dffbaaa8183 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,31 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "gotop"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc="; + sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy"; }; runVend = true; - vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs="; + vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) ''; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; - changelog = "https://github.com/xxxserxxx/gotop/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index 6f557e05cd1..54bc72144ea 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hostctl"; - version = "1.0.14"; + version = "1.1.0"; src = fetchFromGitHub { owner = "guumaster"; repo = pname; rev = "v${version}"; - sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9"; + sha256 = "sha256-X07JvXN1mwOQE2XBfaYbqQnQ92fBSg/Erj0yUygAqmM="; }; - vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c"; + vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 4253ff3e7c9..85d9df5df48 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g="; + sha256 = "sha256-zbTS4nGb2jDYGhNYxoPaVv9kAc51CQOi9qiHiSLjAjo="; }; - cargoSha256 = "sha256-xxYfaGhAtLESpy4gdE3IjE29W+DGnI1ed020mxjT3TI="; + cargoSha256 = "sha256-ujVlOShZOuaV3B1ydggVJXLNMQHoTZC0dJaw+/ajVFg="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 6bdd6dea029..306c25498ad 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -20,7 +20,6 @@ mkDerivation rec { buildInputs = [ boost ]; qmakeFlags = [ "VERSION=${version}" ]; - enableParallelBuilding = true; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index b3f48085d1d..12fe3a9c9e0 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -26,11 +26,7 @@ in stdenv.mkDerivation rec { sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; }; - phases = [ - "unpackPhase" - "installPhase" - "fixupPhase" - ]; + dontBuild = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perlPackages.perl beancount ] ++ perlDeps; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 93f65f45d37..67f69ecc71d 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -8,33 +8,24 @@ , Security , ansi2html , installShellFiles -, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0="; + sha256 = "sha256-PM6bx7qzEx4He9aX4WRO7ad/f9+wzT+gPGXKwYwG8+A="; }; - patches = [ - # detect wezterm through TERM again which was removed in 0.23.1 - (fetchpatch { - url = "https://github.com/lunaryorn/mdcat/commit/a897b223904748a47c277f7c9a07d59e7d5c916b.patch"; - sha256 = "sha256-tSeNyrlqoGvlfQ3xMRkvqZ7HajMvPCIk7kyt/sVjmTo="; - }) - ]; - nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-r0dJ/lDOfRzEdwySR/eEvsrO8qn4g7ZIfpekiirUp3Q="; + cargoSha256 = "sha256-GL9WGoyM1++QFAR+bzj0XkjaRaDCWcbcahles5amNpk="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 0e13e4c5f35..0dff6d76fff 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -30,14 +30,13 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.7.3"; - disabled = ! python3Packages.isPy3k; + version = "12.3.0"; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0gs2w9kl5wwrs0hx2sivq3pdvpf3lkaifblwfbz5g31yl770blji"; + sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2"; }; nativeBuildInputs = with python3Packages; [ @@ -64,7 +63,7 @@ buildPythonApplication rec { pypdf2 pytest pytest-helpers-namespace - pytest_xdist + pytest-xdist pytest-cov python-xmp-toolkit pytestCheckHook diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index 57e79b08fda..c3d005a97e0 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation { name = "papertrail-${(import ./gemset.nix).papertrail.version}"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index b37928fc7c5..3af64e39ed1 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "reckon"; version = (import ./gemset.nix).reckon.version; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 664866f7f2d..5f301ae8891 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -32,7 +32,10 @@ stdenv.mkDerivation { }) ]; - makeFlags = [ "prefix=$(out)" ] + makeFlags = [ + "prefix=$(out)" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional stdenv.isDarwin "SYS=darwin" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1dc31eebf57..9e069adc6e0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -449,6 +449,7 @@ mapAliases ({ linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + lobster-two = google-fonts; # added 2021-07-22 lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 @@ -756,6 +757,7 @@ mapAliases ({ sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31 + skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slack-dark = slack; # added 2020-03-27 slic3r-prusa3d = prusa-slicer; # added 2019-05-21 @@ -888,6 +890,7 @@ mapAliases ({ virtviewer = virt-viewer; # added 2015-12-24 virtmanager = virt-manager; # added 2019-10-29 virtmanager-qt = virt-manager-qt; # added 2019-10-29 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 @@ -1136,6 +1139,7 @@ mapAliases ({ kwin-dynamic-workspaces kwin-tiling krohnkite + krunner-symbols ; inherit (libsForQt5) sddm diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17eab4180e8..27d4468a189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -241,6 +241,8 @@ in cereal = callPackage ../development/libraries/cereal { }; + cewl = callPackage ../tools/security/cewl { }; + checkov = callPackage ../development/tools/analysis/checkov {}; chrysalis = callPackage ../applications/misc/chrysalis { }; @@ -931,6 +933,10 @@ in cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { + inherit (lxqt) qtermwidget; + }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); @@ -1155,6 +1161,8 @@ in argyllcms = callPackage ../tools/graphics/argyllcms {}; + arj = callPackage ../tools/archivers/arj { }; + arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) @@ -1253,6 +1261,8 @@ in betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; + bitwise = callPackage ../tools/misc/bitwise { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; @@ -1554,6 +1564,8 @@ in github-commenter = callPackage ../development/tools/github-commenter { }; + github-desktop = callPackage ../applications/version-management/github-desktop { }; + github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; gitless = callPackage ../applications/version-management/gitless { python = python3; }; @@ -1644,6 +1656,8 @@ in lesspass-cli = callPackage ../tools/security/lesspass-cli { }; + lsix = callPackage ../tools/graphics/lsix { }; + mpdevil = callPackage ../applications/audio/mpdevil { }; pacparser = callPackage ../tools/networking/pacparser { }; @@ -2555,7 +2569,9 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { }; + dua = callPackage ../tools/misc/dua { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; duf = callPackage ../tools/misc/duf { }; @@ -3218,6 +3234,8 @@ in rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; + rm-improved = callPackage ../applications/misc/rm-improved { }; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; restream = callPackage ../applications/misc/remarkable/restream { }; @@ -3591,6 +3609,8 @@ in cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { }; + cdpr = callPackage ../tools/networking/cdpr { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -6077,6 +6097,8 @@ in itm-tools = callPackage ../development/tools/misc/itm-tools { }; + iwgtk = callPackage ../tools/networking/iwgtk { }; + ix = callPackage ../tools/misc/ix { }; jaaa = callPackage ../applications/audio/jaaa { }; @@ -6345,6 +6367,8 @@ in lf = callPackage ../tools/misc/lf {}; + lha = callPackage ../tools/archivers/lha { }; + lhasa = callPackage ../tools/compression/lhasa {}; libcpuid = callPackage ../tools/misc/libcpuid { }; @@ -6353,6 +6377,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; + libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { @@ -9240,6 +9266,8 @@ in teler = callPackage ../tools/security/teler { }; + telescope = callPackage ../applications/networking/browsers/telescope { }; + termius = callPackage ../applications/networking/termius { }; termplay = callPackage ../tools/misc/termplay { }; @@ -9876,9 +9904,7 @@ in tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; - tigervnc = callPackage ../tools/admin/tigervnc { - fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; - }; + tigervnc = callPackage ../tools/admin/tigervnc {}; tightvnc = callPackage ../tools/admin/tightvnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc @@ -13198,6 +13224,8 @@ in buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; + buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; bump = callPackage ../development/tools/github/bump { }; @@ -13783,6 +13811,8 @@ in khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + ko = callPackage ../development/tools/ko { }; + krankerl = callPackage ../development/tools/krankerl { }; krew = callPackage ../development/tools/krew { }; @@ -13937,7 +13967,9 @@ in nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { }; + nexus = callPackage ../development/tools/repository-managers/nexus { + jre_headless = jre8_headless; + }; nwjs = callPackage ../development/tools/nwjs { gconf = pkgs.gnome2.GConf; @@ -14339,6 +14371,8 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; + toil = callPackage ../applications/science/misc/toil { }; + travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -17088,7 +17122,9 @@ in libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; - libtiff = callPackage ../development/libraries/libtiff { }; + libtiff = if stdenv.isDarwin && stdenv.isAarch64 + then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } + else callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -18092,6 +18128,10 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + quill = callPackage ../tools/security/quill { + inherit (darwin.apple_sdk.frameworks) Security; + }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; qwt = callPackage ../development/libraries/qwt {}; @@ -20046,9 +20086,11 @@ in postgresql_13 postgresql_14 ; - postgresql = postgresql_11.override { this = postgresql; }; + postgresql = postgresql_13.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresql11Packages = pkgs.postgresqlPackages; + postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; + postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; + postgresql13Packages = pkgs.postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -21933,6 +21975,8 @@ in usbutils = callPackage ../os-specific/linux/usbutils { }; + userhosts = callPackage ../tools/networking/userhosts { }; + usermount = callPackage ../os-specific/linux/usermount { }; util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } @@ -22405,8 +22449,6 @@ in lmodern = callPackage ../data/fonts/lmodern { }; - lobster-two = callPackage ../data/fonts/lobster-two {}; - logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules {}; # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi @@ -22944,7 +22986,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) buildPythonApplication appdirs colorama python-dateutil - requests requests_toolbelt setuptools sqlalchemy fusepy; + requests requests-toolbelt setuptools sqlalchemy fusepy; }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; @@ -23431,7 +23473,7 @@ in confclerk = callPackage ../applications/misc/confclerk { }; - copyq = libsForQt514.callPackage ../applications/misc/copyq { }; + copyq = libsForQt5.callPackage ../applications/misc/copyq { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; @@ -23441,6 +23483,8 @@ in corrscope = libsForQt5.callPackage ../applications/video/corrscope { }; + coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; + csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { @@ -23936,6 +23980,8 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles; + fsv = callPackage ../applications/misc/fsv { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -24832,6 +24878,8 @@ in cairo = cairo.override { xcbSupport = true; }; }; + i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { }; + i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { }; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; @@ -25192,6 +25240,8 @@ in ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kube-score = callPackage ../applications/networking/cluster/kube-score { }; @@ -25518,7 +25568,7 @@ in matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { inherit (python3Packages) buildPythonApplication buildPythonPackage - pygobject3 pytestrunner requests responses pytest python-olm + pygobject3 pytest-runner requests responses pytest python-olm canonicaljson; }; @@ -25642,6 +25692,8 @@ in mmtc = callPackage ../applications/audio/mmtc { }; + mnamer = callPackage ../applications/misc/mnamer { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -25886,6 +25938,8 @@ in nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; + nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-menu = callPackage ../applications/misc/nwg-menu { }; @@ -26803,7 +26857,7 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; rofimoji = callPackage ../applications/misc/rofimoji { - inherit (python3Packages) buildPythonApplication ConfigArgParse; + inherit (python3Packages) buildPythonApplication configargparse; }; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; @@ -26909,8 +26963,6 @@ in skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; slmenu = callPackage ../applications/misc/slmenu {}; @@ -27683,8 +27735,6 @@ in qtermwidget = lxqt.qtermwidget; }; - virtinst = callPackage ../applications/virtualization/virtinst {}; - virtscreen = callPackage ../tools/admin/virtscreen {}; virtual-ans = callPackage ../applications/audio/virtual-ans {}; @@ -28515,6 +28565,8 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + eclair = callPackage ../applications/blockchains/eclair.nix { }; + electrs = callPackage ../applications/blockchains/electrs.nix { }; elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; @@ -31151,7 +31203,6 @@ in inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - boehmgc = boehmgc.override { enableLargeConfig = true; }; inherit (darwin.apple_sdk.frameworks) Security; }) nix diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 6a189c0005a..1ca8621b711 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -285,21 +285,24 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; - Nuget = buildDotnetPackage { + Nuget = buildDotnetPackage rec { baseName = "Nuget"; - version = "4.9.1"; + version = "5.6.0.6489"; src = fetchFromGitHub { owner = "mono"; - repo = "nuget-binary"; - rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c"; - sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; + repo = "linux-packaging-nuget"; + rev = "upstream/${version}.bin"; + sha256 = "sha256-71vjM7a+F0DNTY+dML3UBSkrVyXv/k5rdl7iXBKSpNM="; }; - phases = [ "unpackPhase" "installPhase" ]; + # configurePhase breaks the binary and results in + # `File does not contain a valid CIL image.` + dontConfigure = true; + dontBuild = true; + dontPlacateNuget = true; outputFiles = [ "*" ]; - dllFiles = [ "NuGet*.dll" ]; exeFiles = [ "nuget.exe" ]; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 34f99561601..4d4c172296a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -30,6 +30,10 @@ let inherit lib; }; + mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix { + inherit lib; + }; + # Contains both melpa stable & unstable melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix { inherit lib pkgs; @@ -53,12 +57,14 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ pkgs ? pkgs' , lib ? pkgs.lib , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self + , nongnuPackages ? mkNongnuPackages { inherit lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } + // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } // orgPackages // { inherit orgPackages; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 28f8436ea99..c17ea27a9e5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -848,8 +848,6 @@ let ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; - ocaml_http = callPackage ../development/ocaml-modules/http { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; @@ -866,9 +864,7 @@ let ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; - }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff35e523146..6124fc5859e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1328,12 +1328,12 @@ let propagatedBuildInputs = [ CarpClan ]; }; - BKeywords = buildPerlPackage { + BKeywords = buildPerlPackage rec { pname = "B-Keywords"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz"; - sha256 = "12481z1z1nyrjlkizzqn4cdmcrfjkc3hvxppqipsf6r5gnffh9as"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-${version}.tar.gz"; + sha256 = "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56"; }; meta = { description = "Lists of reserved barewords and symbol names"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 017d27a8a20..294c90f6656 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -34,12 +34,15 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + ConfigArgParse = configargparse; # added 2021-03-18 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "it's dependency lammps-cython no longer builds"; diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 + djangorestframework-jwt = drf-jwt; dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 @@ -52,10 +55,17 @@ mapAliases ({ privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestquickcheck = pytest-quickcheck; # added 2021-07-20 + pytestrunner = pytest-runner; # added 2021-01-04 + pytest_xdist = pytest-xdist; # added 2021-01-04 + python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 @@ -63,5 +73,5 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; - bt_proximity = bt-proximity; # added 2021-07-02 + zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c6164618cf..5cab2a4f0c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -199,6 +199,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; + addict = callPackage ../development/python-modules/addict { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; adext = callPackage ../development/python-modules/adext { }; @@ -1607,7 +1609,6 @@ in { conda = callPackage ../development/python-modules/conda { }; - ConfigArgParse = self.configargparse; # added 2021-03-18 configargparse = callPackage ../development/python-modules/configargparse { }; configobj = callPackage ../development/python-modules/configobj { }; @@ -1769,6 +1770,8 @@ in { d2to1 = callPackage ../development/python-modules/d2to1 { }; + dacite = callPackage ../development/python-modules/dacite { }; + daemonize = callPackage ../development/python-modules/daemonize { }; daemonocle = callPackage ../development/python-modules/daemonocle { }; @@ -1913,6 +1916,8 @@ in { devpi-common = callPackage ../development/python-modules/devpi-common { }; + devtools = callPackage ../development/python-modules/devtools { }; + diagrams = callPackage ../development/python-modules/diagrams { }; diceware = callPackage ../development/python-modules/diceware { }; @@ -2064,8 +2069,6 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - djangorestframework-jwt = self.drf-jwt; - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; django_reversion = callPackage ../development/python-modules/django_reversion { }; @@ -2297,6 +2300,8 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; + enlighten = callPackage ../development/python-modules/enlighten { }; + enocean = callPackage ../development/python-modules/enocean { }; enrich = callPackage ../development/python-modules/enrich { }; @@ -2731,6 +2736,8 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + fritzprofiles = callPackage ../development/python-modules/fritzprofiles { }; + frozendict = callPackage ../development/python-modules/frozendict { }; frozenlist = callPackage ../development/python-modules/frozenlist { }; @@ -4734,6 +4741,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + nengo = callPackage ../development/python-modules/nengo { }; + neo = callPackage ../development/python-modules/neo { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; @@ -5409,6 +5418,8 @@ in { python-juicenet = callPackage ../development/python-modules/python-juicenet { }; + python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; @@ -5544,6 +5555,8 @@ in { precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + prefixed = callPackage ../development/python-modules/prefixed { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; @@ -5683,6 +5696,8 @@ in { py-ubjson = callPackage ../development/python-modules/py-ubjson { }; + py17track = callPackage ../development/python-modules/py17track { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); @@ -6004,6 +6019,8 @@ in { pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + pygame-gui = callPackage ../development/python-modules/pygame-gui { }; + pygatt = callPackage ../development/python-modules/pygatt { }; pygbm = callPackage ../development/python-modules/pygbm { }; @@ -6176,12 +6193,16 @@ in { pyls-black = callPackage ../development/python-modules/pyls-black { }; + pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { }; + pyls-isort = callPackage ../development/python-modules/pyls-isort { }; pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; + pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { }; + PyLTI = callPackage ../development/python-modules/pylti { }; pylutron = callPackage ../development/python-modules/pylutron { }; @@ -6262,6 +6283,8 @@ in { pymumble = callPackage ../development/python-modules/pymumble { }; + pymunk = callPackage ../development/python-modules/pymunk { }; + pymupdf = callPackage ../development/python-modules/pymupdf { }; PyMVGLive = callPackage ../development/python-modules/pymvglive { }; @@ -6784,8 +6807,7 @@ in { pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { }; - pytest-cov = self.pytestcov; # self 2021-01-04 - pytestcov = callPackage ../development/python-modules/pytest-cov { }; + pytest-cov = callPackage ../development/python-modules/pytest-cov { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; @@ -6861,8 +6883,7 @@ in { pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - pytest-quickcheck = self.pytestquickcheck; - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-raises = callPackage ../development/python-modules/pytest-raises { }; @@ -6882,8 +6903,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - pytest-runner = self.pytestrunner; # added 2021-01-04 - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { sanic = self.sanic.override { doCheck = false; }; @@ -6927,7 +6947,6 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; @@ -7126,7 +7145,6 @@ in { python-sat = callPackage ../development/python-modules/python-sat { }; python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; - python_simple_hipchat = self.python-simple-hipchat; python-slugify = callPackage ../development/python-modules/python-slugify { }; @@ -7540,6 +7558,8 @@ in { requests-file = callPackage ../development/python-modules/requests-file { }; + requests-futures = callPackage ../development/python-modules/requests-futures { }; + requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; @@ -7554,8 +7574,6 @@ in { requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; requirements-detector = callPackage ../development/python-modules/requirements-detector { }; @@ -7809,8 +7827,6 @@ in { inherit (pkgs) gfortran glibcLocales; }; - scikitlearn = self.scikit-learn; - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; @@ -8236,6 +8252,8 @@ in { sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; + sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { }; + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { }; @@ -8486,6 +8504,8 @@ in { telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; + teletype = callPackage ../development/python-modules/teletype { }; + telfhash = callPackage ../development/python-modules/telfhash { }; tempita = callPackage ../development/python-modules/tempita { }; @@ -8691,6 +8711,8 @@ in { toml = callPackage ../development/python-modules/toml { }; + tomli = callPackage ../development/python-modules/tomli { }; + tomlkit = callPackage ../development/python-modules/tomlkit { }; toolz = callPackage ../development/python-modules/toolz { }; @@ -9450,9 +9472,7 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + zc_buildout = callPackage ../development/python-modules/buildout { }; zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 471548b9fa2..48ddb18291a 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -478,9 +478,8 @@ with self; with super; { pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; - pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; python-otr = callPackage ../development/python-modules/python-otr { }; |