diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e1efa65be99..9bf862302d6b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4755,6 +4755,12 @@ githubId = 40566146; name = "Jonas Braun"; }; + j-hui = { + email = "j-hui@cs.columbia.edu"; + github = "j-hui"; + githubId = 11800204; + name = "John Hui"; + }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; @@ -8768,6 +8774,12 @@ githubId = 5636; name = "Steve Purcell"; }; + putchar = { + email = "slim.cadoux@gmail.com"; + github = "putchar"; + githubId = 8208767; + name = "Slim Cadoux"; + }; puzzlewolf = { email = "nixos@nora.pink"; github = "puzzlewolf"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index f4155d6f8ce6..fb11b19229e2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -84,7 +84,7 @@ - The linux_latest kernel was updated to the 5.12 series. It + The linux_latest kernel was updated to the 5.13 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). 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 9120c1a7181c..f1278ed3b1a3 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 @@ -668,11 +668,6 @@ to use wildcards in the source argument. - - - <<<<<<< HEAD - - The openrazer and @@ -715,6 +710,23 @@ release is also still available. + + + The kubernetes package was upgraded to + 1.22. The kubernetes.apiserver.kubeletHttps + option was removed and HTTPS is always used. + + + + + The attribute linuxPackages_latest_hardened + was dropped because the hardened patches lag behind the + upstream kernel which made version bumps harder. If you want + to use a hardened kernel, please pin it explicitly with a + versioned attribute such as + linuxPackages_5_10_hardened. + +
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index d019bb318096..ff2425e725e8 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -64,14 +64,51 @@ - To manually configure the network on the graphical installer, first disable - network-manager with systemctl stop NetworkManager. + On the graphical installer, you can configure the network, wifi included, + through NetworkManager. Using the nmtui program, you + can do so even in a non-graphical session. If you prefer to configure the + network manually, disable NetworkManager with + systemctl stop NetworkManager. - To manually configure the wifi on the minimal installer, run - wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' - 'key'). + On the minimal installer, NetworkManager is not available, so configuration + must be perfomed manually. To configure the wifi, first start wpa_supplicant + with sudo systemctl start wpa_supplicant, then run + wpa_cli. For most home networks, you need to type + in the following commands: + +> add_network +0 +> set_network 0 ssid "myhomenetwork" +OK +> set_network 0 psk "mypassword" +OK +> set_network 0 key_mgmt WPA-PSK +OK +> enable_network 0 +OK + + For enterprise networks, for example eduroam, instead do: + +> add_network +0 +> set_network 0 ssid "eduroam" +OK +> set_network 0 identity "myname@example.com" +OK +> set_network 0 password "mypassword" +OK +> set_network 0 key_mgmt WPA-EAP +OK +> enable_network 0 +OK + + When successfully connected, you should see a line such as this one + +<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] + + you can now leave wpa_cli by typing quit. diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index 49b97c203fe6..359f2e5b2e58 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -30,7 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Python optimizations were disabled again. Builds with optimizations enabled are not reproducible. Optimizations can now be enabled with an option. -- The linux_latest kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). +- The linux_latest kernel was updated to the 5.13 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). ## New Services {#sec-release-21.05-new-services} diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 6d29ca9594bb..687d1fedd39e 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -171,7 +171,6 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. -<<<<<<< HEAD - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. @@ -182,6 +181,13 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. +- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. + +- The attribute `linuxPackages_latest_hardened` was dropped because the hardened patches + lag behind the upstream kernel which made version bumps harder. If you want to use + a hardened kernel, please pin it explicitly with a versioned attribute such as + `linuxPackages_5_10_hardened`. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The linux kernel package infrastructure was moved out of `all-packages.nix`, and restructured. Linux related functions and attributes now live under the `pkgs.linuxKernel` attribute set. diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 1720e553d733..0372148cb33c 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1029,10 +1029,11 @@ if __name__ == "__main__": args = arg_parser.parse_args() global test_script + testscript = pathlib.Path(args.testscript).read_text() def test_script() -> None: with log.nested("running the VM test script"): - exec(pathlib.Path(args.testscript).read_text(), globals()) + exec(testscript, globals()) log = Logger() @@ -1061,7 +1062,8 @@ if __name__ == "__main__": process.terminate() log.close() + interactive = args.interactive or (not bool(testscript)) tic = time.time() - run_tests(args.interactive) + run_tests(interactive) toc = time.time() print("test script finished in {:.2f}s".format(toc - tic)) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6369d6ef05d4..e95ebe16ecac 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -186,6 +186,14 @@ rec { --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ --set vlans '${toString vlans}' + + ${lib.optionalString (testScript == "") '' + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms + wrapProgram $out/bin/nixos-run-vms \ + --set startScripts "''${vmStartScripts[*]}" \ + --set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \ + --set vlans '${toString vlans}' + ''} ''); # Make a full-blown test diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 8e3aa20daa65..3c503fba2a39 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -54,7 +54,12 @@ with lib; An ssh daemon is running. You then must set a password for either "root" or "nixos" with `passwd` or add an ssh key to /home/nixos/.ssh/authorized_keys be able to login. + + If you need a wireless connection, type + `sudo systemctl start wpa_supplicant` and configure a + network using `wpa_cli`. See the NixOS manual for details. '' + optionalString config.services.xserver.enable '' + Type `sudo systemctl start display-manager' to start the graphical user interface. ''; @@ -71,6 +76,7 @@ with lib; # Enable wpa_supplicant, but don't start it by default. networking.wireless.enable = mkDefault true; + networking.wireless.userControlled.enable = true; systemd.services.wpa_supplicant.wantedBy = mkOverride 50 []; # Tell the Nix evaluator to garbage collect more aggressively. diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix index be3f40f6bd86..6c2df95886e7 100644 --- a/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/nixos/modules/services/blockchain/ethereum/geth.nix @@ -83,8 +83,8 @@ let }; syncmode = mkOption { - type = types.enum [ "fast" "full" "light" ]; - default = "fast"; + type = types.enum [ "snap" "fast" "full" "light" ]; + default = "snap"; description = "Blockchain sync mode."; }; diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index f1531caa7544..f842f784b349 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -190,12 +190,6 @@ in type = nullOr path; }; - kubeletHttps = mkOption { - description = "Whether to use https for connections to kubelet."; - default = true; - type = bool; - }; - preferredAddressTypes = mkOption { description = "List of the preferred NodeAddressTypes to use for kubelet connections."; type = nullOr str; @@ -365,7 +359,6 @@ in "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ ${optionalString (cfg.basicAuthFile != null) "--basic-auth-file=${cfg.basicAuthFile}"} \ - --kubelet-https=${boolToString cfg.kubeletHttps} \ ${optionalString (cfg.kubeletClientCaFile != null) "--kubelet-certificate-authority=${cfg.kubeletClientCaFile}"} \ ${optionalString (cfg.kubeletClientCertFile != null) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 3f55719027f0..fecea7a15f3d 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -58,7 +58,7 @@ in services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { flannel-cr = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRole"; metadata = { name = "flannel"; }; rules = [{ @@ -79,7 +79,7 @@ in }; flannel-crb = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRoleBinding"; metadata = { name = "flannel"; }; roleRef = { diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index b0565fcea162..0a059723cccb 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -90,6 +90,14 @@ in ''; }; + resume = mkOption { + default = false; + type = types.bool; + description = '' + Use saved config, if any (and prefer over configuration passed with ). + ''; + }; + ca = mkOption { default = "https://acme-v02.api.letsencrypt.org/directory"; example = "https://acme-staging-v02.api.letsencrypt.org/directory"; @@ -142,7 +150,7 @@ in startLimitIntervalSec = 14400; startLimitBurst = 10; serviceConfig = { - ExecStart = "${cfg.package}/bin/caddy run --config ${configJSON}"; + ExecStart = "${cfg.package}/bin/caddy run ${optionalString cfg.resume "--resume"} --config ${configJSON}"; ExecReload = "${cfg.package}/bin/caddy reload --config ${configJSON}"; Type = "simple"; User = cfg.user; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index d606d473d91e..03133fa1bc43 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -375,7 +375,7 @@ let } trap cleanup EXIT - tmp=$(mktemp -d initrd-secrets.XXXXXXXXXX) + tmp=$(mktemp -d ''${TMPDIR:-/tmp}/initrd-secrets.XXXXXXXXXX) ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source: let source' = if source == null then dest else toString source; in diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 1c145e8ff477..225f9dc67fcc 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -32,9 +32,6 @@ in assertions = [ { assertion = cfg.defaultGatewayWindowSize == null; message = "networking.defaultGatewayWindowSize is not supported by networkd."; - } { - assertion = cfg.vswitches == {}; - message = "networking.vswitches are not supported by networkd."; } { assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null; message = "networking.defaultGateway.interface is not supported by networkd."; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8369f60e7b2e..b1c3ccf782d1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -259,6 +259,7 @@ in miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; misc = handleTest ./misc.nix {}; + mod_perl = handleTest ./mod_perl.nix {}; moinmoin = handleTest ./moinmoin.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 485efc0fb78c..a0b629086b5a 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -33,18 +33,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { testScript = let - hardened-malloc-tests = pkgs.stdenv.mkDerivation { - name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}"; - src = pkgs.graphene-hardened-malloc.src; - buildPhase = '' - cd test/simple-memory-corruption - make -j4 - ''; - - installPhase = '' - find . -type f -executable -exec install -Dt $out/bin '{}' + - ''; - }; + hardened-malloc-tests = pkgs.graphene-hardened-malloc.ld-preload-tests; in '' machine.wait_for_unit("multi-user.target") @@ -107,20 +96,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { machine.fail("systemctl kexec") - # Test hardened memory allocator - def runMallocTestProg(prog_name, error_text): - text = "fatal allocator error: " + error_text - if not text in machine.fail( - "${hardened-malloc-tests}/bin/" - + prog_name - + " 2>&1" - ): - raise Exception("Hardened malloc does not work for {}".format(error_text)) - - with subtest("The hardened memory allocator works"): - runMallocTestProg("double_free_large", "invalid free") - runMallocTestProg("unaligned_free_small", "invalid unaligned free") - runMallocTestProg("write_after_free_small", "detected write after free") + machine.succeed("${hardened-malloc-tests}/bin/run-tests") ''; }) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 6511d8db5b77..463868d4299a 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -33,8 +33,12 @@ with pkgs; { linux_4_19 = makeKernelTest "4.19" packages.linux_4_19; linux_5_4 = makeKernelTest "5.4" packages.linux_5_4; linux_5_10 = makeKernelTest "5.10" packages.linux_5_10; - linux_5_12 = makeKernelTest "5.12" packages.linux_5_12; linux_5_13 = makeKernelTest "5.13" packages.linux_5_13; + linux_hardened_4_14 = makeKernelTest "4.14" packages.linux_4_14_hardened; + linux_hardened_4_19 = makeKernelTest "4.19" packages.linux_4_19_hardened; + linux_hardened_5_4 = makeKernelTest "5.4" packages.linux_5_4_hardened; + linux_hardened_5_10 = makeKernelTest "5.10" packages.linux_5_10_hardened; + linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/nixos/tests/mod_perl.nix b/nixos/tests/mod_perl.nix new file mode 100644 index 000000000000..29a1eb6503fd --- /dev/null +++ b/nixos/tests/mod_perl.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "mod_perl"; + + meta = with pkgs.lib.maintainers; { + maintainers = [ sgo ]; + }; + + machine = { config, lib, pkgs, ... }: { + services.httpd = { + enable = true; + adminAddr = "admin@localhost"; + virtualHosts."modperl" = + let + inc = pkgs.writeTextDir "ModPerlTest.pm" '' + package ModPerlTest; + use strict; + use Apache2::RequestRec (); + use Apache2::RequestIO (); + use Apache2::Const -compile => qw(OK); + sub handler { + my $r = shift; + $r->content_type('text/plain'); + print "Hello mod_perl!\n"; + return Apache2::Const::OK; + } + 1; + ''; + startup = pkgs.writeScript "startup.pl" '' + use lib "${inc}", + split ":","${with pkgs.perl.pkgs; makeFullPerlPath ([ mod_perl2 ])}"; + 1; + ''; + in + { + extraConfig = '' + PerlRequire ${startup} + ''; + locations."/modperl" = { + extraConfig = '' + SetHandler perl-script + PerlResponseHandler ModPerlTest + ''; + }; + }; + enablePerl = true; + }; + }; + testScript = { ... }: '' + machine.wait_for_unit("httpd.service") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/modperl") + assert "Hello mod_perl!" in response, "/modperl handler did not respond" + ''; +}) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index a0443aa9a6ae..38b7e0406038 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "hqplayer-desktop"; - version = "4.12.2-36"; + version = "4.13.1-38"; src = fetchurl { url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q="; + sha256 = "sha256-DEZWEGk5SfhcNQddehCBVbfeTH8KfVCdaxQ+F3MrRe8="; }; unpackPhase = '' diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index c2171d4cecc4..131b2c680b9b 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.54.0"; + version = "3.58.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f"; + sha256 = "1bsmc4p7b6v4mm8fi9zsy0knzdccnz1dc6ckrdr18kw2ji0hiyx2"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index e44b9f35daaf..93f62e23f3a9 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "4.0.1"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f"; + sha256 = "0054gqvnx3brpfxr06dcby0z0dirwv9ydi6gj5iz0cxn0fbi6gv2"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index c26270beef61..62c7c3b3da47 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - phases = [ "unpackPhase" "buildPhase" ]; + dontInstall = true; nativeBuildInputs = [ yarn ]; buildPhase = '' export HOME=$NIX_BUILD_ROOT diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 0d50c24d3976..d3ff564b8f0d 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -2,18 +2,18 @@ , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let - version = "3.5.18"; + version = "3.8.18"; pname = "standardnotes"; name = "${pname}-${version}"; plat = { - i386-linux = "-i386"; + i386-linux = "i386"; x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system}; sha256 = { - i386-linux = "009fnnd7ysxkyykkbmhvr0vn13b21j1j5mzwdvqdkhm9v3c9rbgj"; - x86_64-linux = "1zrnvvr9x0s2gp948iajsmgn38xm6x0g2dgxrfjis39rpplsrdww"; + i386-linux = "1xiypsmvpk8i6kab862pipbdfb0y5d5355hdwjmva7v7g26aa7h7"; + x86_64-linux = "03qlxlgyypnvcr40jh6i4wriyax2jbfhrb798cq0n7qlc1y4pg8r"; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 80220241eb68..960e7301126c 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,15 +1,15 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler }: mkDerivation rec { pname = "texmaker"; - version = "5.0.4"; + version = "5.1.0"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx"; + sha256 = "0zhqq9s5r2w44p7xhlxkj0c10jyx0hji5bjdpgp7xdlrvckr9yf6"; }; - buildInputs = [ qtbase qtscript poppler zlib ]; + buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; nativeBuildInputs = [ pkg-config poppler qmake ]; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index cf37512ad9f5..f46e1f499c4d 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -69,23 +69,15 @@ let in mkDerivation rec { pname = "drawpile"; - version = "2.1.17"; + version = "2.1.19"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; + sha256 = "sha256-MNmzcqTHfMms6q3ZilrChE5WoGzGxnAOkB0a75udA1I="; }; - patches = [ - # fix for libmicrohttpd 0.9.71 - (fetchpatch { - url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff"; - sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA="; - name = "mhdfix.patch"; }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 001616ab41dd..7f4f4cc1a976 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,4 +1,11 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, qtimageformats +, qtsvg +}: mkDerivation rec { pname = "qview"; @@ -15,6 +22,8 @@ mkDerivation rec { buildInputs = [ qtbase + qtimageformats + qtsvg ]; patchPhase = '' @@ -24,7 +33,7 @@ mkDerivation rec { meta = with lib; { description = "Practical and minimal image viewer"; homepage = "https://interversehq.com/qview/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ acowley ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index af04d69cddf0..96042c99b283 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wp5GrOchNvGfQN9trcaq2hnhIHQ+W7zolvCzhCRDSqw="; + sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU="; }; - vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; + vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index b1fac789fe15..c0c68ac88ab3 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-p8rca3PsnT/3Lp6W30VvqR9aPr6EIuNrH5gsxL0lZ0Q="; + hash = "sha256-jR1zOmVkFGgA5bzMDHQ8HMToi18Y3n2aJDx7pwsZEhM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 39044301ec7c..510623433173 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.12.3"; + version = "0.12.12"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE="; + sha256 = "sha256-zvWJvMmb0TlFYXrT2QUgMG6uleT42+y+F4bSZQ2ftnE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 1d9dc3811aae..355c5915db27 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sfm"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "afify"; repo = pname; rev = "v${version}"; - hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw="; + hash = "sha256-NmafUezwKK9bYPAWDNhegyjqkb4GY/i1WEtQ9puIaig="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 962059600a4c..867dee5bcd30 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.36.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVHcunpS+2/0d7XaUZ95m9QpVHCG1Tq8LJ9KNURSRy8="; + sha256 = "sha256-ZKv207pkjgXtCZ6kXGn94i8QtOBHpSkPKo1Sy2Nw9qQ="; }; - vendorSha256 = "sha256-4uRhbRPfCRYwFlfucXOYhLruj7hkV4G9Sxjh9yQkDEQ="; + vendorSha256 = "sha256-E5sfT7uGnruVUfhhjkZM2mgauXzbmcLWS6s1J85nssE="; doCheck = false; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix new file mode 100644 index 000000000000..4edf2e2567af --- /dev/null +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -0,0 +1,21 @@ +{ fetchFromGitHub, lib, xmrig }: + +xmrig.overrideAttrs (oldAttrs: rec { + pname = "xmrig-mo"; + version = "6.14.1-mo1"; + + src = fetchFromGitHub { + owner = "MoneroOcean"; + repo = "xmrig"; + rev = "v${version}"; + sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM="; + }; + + meta = with lib; { + description = "A fork of the XMRig CPU miner with support for algorithm switching"; + homepage = "https://github.com/MoneroOcean/xmrig"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ j0hax ]; + }; +}) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 120392d965e6..6f08f644b2e5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -256,15 +256,28 @@ let gnFlags = mkGnFlags ({ # Main build and toolchain settings: + # Create an official and optimized release build (only official builds + # should be distributed to users, as non-official builds are intended for + # development and may not be configured appropriately for production, + # e.g. unsafe developer builds have developer-friendly features that may + # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; + # Build Chromium using the system toolchain (for Linux distributions): custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; + # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; + # The default value is hardcoded instead of using pkg-config: system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; + # We aren't compiling with Chrome's Clang (would enable Chrome-specific + # plugins for enforcing coding guidelines, etc.): clang_use_chrome_plugins = false; - blink_symbol_level = 0; + # Disable symbols (they would negatively affect the performance of the + # build since the symbols are large and dealing with them is slow): symbol_level = 0; + blink_symbol_level = 0; # Google API key, see: https://www.chromium.org/developers/how-tos/api-keys # Note: The API key is for NixOS/nixpkgs use ONLY. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e6912cc212d4..641742b96789 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "92.0.4515.131", - "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n", - "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g", + "version": "92.0.4515.159", + "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", + "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", "deps": { "gn": { "version": "2021-05-07", diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index e699115ab29d..551453e9a2eb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -72,9 +72,9 @@ let policies = { DisableAppUpdate = true; - }; + } // config.firefox.policies or {}; - policiesJson = writeText "no-update-firefox-policy.json" (builtins.toJSON { inherit policies; }); + policiesJson = writeText "firefox-policies.json" (builtins.toJSON { inherit policies; }); defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index f3da97057959..747523103af8 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.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-MHERRJ9t7EG4sd4gevUnZLA25UnRqZprCXFWkp5roms="; + sha256 = "sha256-pQ8Xhhjpcp9RAUUqEDNWRf9JI7xkDVh2PG2KB0lmScs="; }; - vendorSha256 = "sha256-lzRIXZXrNQOwgl774B9r6OW/O8QwykSk3Mv5oGmvDuY="; + vendorSha256 = "sha256-PBMPTrTk5AzzELitSVQijHnx8YDCiZ7R+cpetUfe2KU="; doCheck = false; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 9ecadd56f150..9f0ebc7d930f 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.13"; + version = "3.13.1"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "09vp2y0ibv20y9yysniv6njzigif4h74pkj31l2a8xw5g19gclna"; + sha256 = "3994444766874bb35c9f886da76f3b24be1cb7bbaf40fad12b16f2af80ac1296"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py b/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py deleted file mode 100755 index 8556ee1e4d73..000000000000 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py +++ /dev/null @@ -1,92 +0,0 @@ -#!@PYTHON@ - -import json -import os -import re -import shlex -import sqlite3 -import subprocess -import sys - - -DB_PATH = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.sqlite') -DB_COPY = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.tmp') -CONFIG_PATH = os.path.join(os.environ['HOME'], '.config/Signal/config.json') - - -def zenity_askyesno(title, text): - args = [ - '@ZENITY@', - '--question', - '--title', - shlex.quote(title), - '--text', - shlex.quote(text) - ] - return subprocess.run(args).returncode == 0 - - -def start_signal(): - os.execvp('@SIGNAL-DESKTOP@', ['@SIGNAL-DESKTOP@'] + sys.argv[1:]) - - -def copy_pragma(name): - result = subprocess.run([ - '@SQLCIPHER@', - DB_PATH, - f"PRAGMA {name};" - ], check=True, capture_output=True).stdout - result = re.search(r'[0-9]+', result.decode()).group(0) - subprocess.run([ - '@SQLCIPHER@', - DB_COPY, - f"PRAGMA key = \"x'{key}'\"; PRAGMA {name} = {result};" - ], check=True, capture_output=True) - - -try: - # Test if DB is encrypted: - con = sqlite3.connect(f'file:{DB_PATH}?mode=ro', uri=True) - cursor = con.cursor() - cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") - con.close() -except: - # DB is encrypted, everything ok: - start_signal() - - -# DB is unencrypted! -answer = zenity_askyesno( - "Error: Signal-Desktop database is not encrypted", - "Should we try to fix this automatically?" - + "You likely want to backup ~/.config/Signal/ first." -) -if not answer: - answer = zenity_askyesno( - "Launch Signal-Desktop", - "DB is unencrypted, should we still launch Signal-Desktop?" - + "Warning: This could result in data loss!" - ) - if not answer: - print('Aborted') - sys.exit(0) - start_signal() - -# Re-encrypt the DB: -with open(CONFIG_PATH) as json_file: - key = json.load(json_file)['key'] -result = subprocess.run([ - '@SQLCIPHER@', - DB_PATH, - f" ATTACH DATABASE '{DB_COPY}' AS signal_db KEY \"x'{key}'\";" - + " SELECT sqlcipher_export('signal_db');" - + " DETACH DATABASE signal_db;" -]).returncode -if result != 0: - print('DB encryption failed') - sys.exit(1) -# Need to copy user_version and schema_version manually: -copy_pragma('user_version') -copy_pragma('schema_version') -os.rename(DB_COPY, DB_PATH) -start_signal() diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f5078181ed67..9b58931eed2c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,9 +10,6 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' -, python3 -, gnome -, sqlcipher }: let @@ -115,7 +112,7 @@ in stdenv.mkDerivation rec { # Symlink to bin mkdir -p $out/bin - ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop-unwrapped + ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop runHook postInstall ''; @@ -140,16 +137,6 @@ in stdenv.mkDerivation rec { patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node ''; - postFixup = '' - # This hack is temporarily required to avoid data-loss for users: - cp ${./db-reencryption-wrapper.py} $out/bin/signal-desktop - substituteInPlace $out/bin/signal-desktop \ - --replace '@PYTHON@' '${python3}/bin/python3' \ - --replace '@ZENITY@' '${gnome.zenity}/bin/zenity' \ - --replace '@SQLCIPHER@' '${sqlcipher}/bin/sqlcipher' \ - --replace '@SIGNAL-DESKTOP@' "$out/bin/signal-desktop-unwrapped" - ''; - # Tests if the application launches and waits for "Link your phone to Signal Desktop": passthru.tests.application-launch = nixosTests.signal-desktop; diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index c648570958d3..936524918e04 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -1,21 +1,14 @@ -{ ctags, fetchurl, fetchpatch, lib, libressl, ncurses, pkg-config, stdenv }: +{ ctags, fetchurl, lib, libressl, ncurses, pkg-config, stdenv }: stdenv.mkDerivation rec { pname = "catgirl"; - version = "1.9"; + version = "1.9a"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "182l7yryqm1ffxqgz3i4lcnzwzpbpm2qvadddmj0xc8dh8513s0w"; + sha256 = "sha256-MEm5mrrWfNp+mBHFjGSOGvvfvBJ+Ho/K+mPUxzJDkV0="; }; - patches = [ - (fetchpatch { - url = "https://git.causal.agency/catgirl/patch/?id=3f3585d0f32e66ad5c8c6c713f315e14810230eb"; - sha256 = "1vrgimvf007bxz8blxm3vjc7g3xwxplwxyrblnsryq54cqaw0xv3"; - }) - ]; - nativeBuildInputs = [ ctags pkg-config ]; buildInputs = [ libressl ncurses ]; strictDeps = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3de7ea1bb62e..7a656c95056b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,655 @@ { - version = "78.13.0"; + version = "91.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/af/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/af/thunderbird-91.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f08190514cb9e7a429e12db93b5423e83f8c4f8b34079e266b797099d6e5b3cb"; + sha256 = "6fb57813f9f0568f3f97aa512c9b94df540e4e2aebdadb11994237bdf167a929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ar/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ar/thunderbird-91.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "cafc6a55a1bd4b1ed0c412cdcce917d803f1d81689a496e09ffd702bf1495c8e"; + sha256 = "398ac9528f19d2457689eb0d4579cfaeb21fe7d0be4a40a66a4216fd6d1e5f16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ast/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ast/thunderbird-91.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b444e1b6cc64b28069382e97f8b966f6d154fbc4216cc67b20ce0105ebd0be89"; + sha256 = "2ac99b80f8ba4f36406fc9df3eaf6f9290f89a23e99736820b5e9fdc14b549ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/be/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/be/thunderbird-91.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "18ef49bc393dfc223638edb54525a336f604c606c36f40e3c0f6e4a883cbb1d9"; + sha256 = "0088a693289b0cdfb441837843dc0342d772c8e0f5d57dd68b620b18e7cc7be5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/bg/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/bg/thunderbird-91.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2fe1b34fbb43e22f8fb7238baca4aa2d5d5df3dbf4baf0aa276fc8bd0dd5bc02"; + sha256 = "ee23796c539b5c118d39a6dcfd3ebb3b3e9c2f0720a45eb920e782e7a43ded14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/br/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/br/thunderbird-91.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e1a46004fefb79e3febf8bcd2b8aa6aa7140b97170740c4b5cc4b6351cb1fd6f"; + sha256 = "5bf147164fbf9dbe3dbe5eba6c4ba81438870da10a6c0e71606ed95a333fcfba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ca/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ca/thunderbird-91.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d7e9112b78155af6e684f9f306e35fb7aa8862f2008aa842729aedf10e5b62ef"; + sha256 = "a1cab93e6e8c3c22ba65364dfabc39a0fa7fb0c6c35b002036068c894d68a093"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cak/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cak/thunderbird-91.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "325acc4638890583fcd2483846cce33a4ed9a2fb376265c926bb8904e37cb6cf"; + sha256 = "9b51ed781b637f417a230901b05018a5a69bbdfee98d1100140bf8e7e1aa8992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cs/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cs/thunderbird-91.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a9926717859e51e5f66c41c0a11a70e8d4e635b8dae3486f454ad24464ad1e80"; + sha256 = "3384ec93657fb7e93bebb010d24edac3dcda240d87dc3c9be3918a8d559e9e3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/cy/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/cy/thunderbird-91.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e8d6edb4ba1b6749517ef5d4ae3300aed654c3aa9d6a6e6d7f4a0ff6c829d139"; + sha256 = "e2e8a9adafc1038872264bedb76a702217502738304a790f887b5cd326c0e58c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/da/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/da/thunderbird-91.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ab5288a8d809f9979eb3a330ec0cd8bb4c5deab564b755f064470fe13df3d0be"; + sha256 = "40a63673b7f3d2cd68758476448b181e1ef1b0ede3dc1031938bf91cb261ba17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/de/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/de/thunderbird-91.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9a477fe13a4a99fc48fae4713b82771ecca367869047ef268d8811dac1aac220"; + sha256 = "4244dbfae753f96287e576680ef8dc9767bcfa1c1ceec68e58580e03d0ef7587"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/dsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/dsb/thunderbird-91.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "deb4947364fd806e06b5c69ea4b51b411b9cd10bec92a23d6d7432d8ba0bbdf0"; + sha256 = "3ba7f369886303bff8ab524218ab588dd6521a3c2d2fb98c857dba69992c7352"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/el/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/el/thunderbird-91.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "18cc09ee14827e4a3f155215a11551791e5708106ae0d993145ccce4890d8cf0"; + sha256 = "d8af9b00e7b27be272b22381dcf5dee91acbabee3113a909cd0f12143ced9ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-CA/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-CA/thunderbird-91.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6afd716eeae087a27a8c75029735e501fd7e32f95a8842bc5ba0e3a64cb31630"; + sha256 = "de8a4a8be9dbf3aedfad1ea8fda7aa14758923d232148f96f1ee356781e87b4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-GB/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-GB/thunderbird-91.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "91e0ad90be9e4e89f5245e660e09c3ad06d1ff807a30b3eb696261a883ea77ea"; + sha256 = "b76b69cd6d10ff0140da9c53b35842f04b798235427f5a058d9911e111e1c73c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/en-US/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/en-US/thunderbird-91.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "97515bda6e141aef0d74696db3459711985f7fb526ca0e2d7544725d72f5fb3b"; + sha256 = "74776e073932dc77d24bf8967b6ff09052c3be7f8b78d82fd4684ed395f633e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-AR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/es-AR/thunderbird-91.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ef6067e00544e37786694d85957c0fbdf12bb20add6f6f5dadc03b095d24513d"; + sha256 = "449d7b060da5f95b8605a49f1ee12e6633b3bd1b3b96a50837fc641e558331b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/es-ES/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/es-ES/thunderbird-91.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "be6df6fa4ed5facfb77a5849e0a4008ec42c2629deb5ea2dc3fa5251891e0306"; + sha256 = "b18e38da156c4242a5108eede2c8cdf236d48561175d842fe54b5dcde2ccfbb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/et/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/et/thunderbird-91.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6c63ddb05366d3a9d0baadceccb3aac8fe3c6788515feeb2649bdc5d717d6d0c"; + sha256 = "96eae79eec62e2661f01424e4a6363c4f541a22cb47bf8d674606553bcf367fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/eu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/eu/thunderbird-91.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "215861f41e59b6e9c5892e9b10483b890a7a4c351376c455001215af4c3bf276"; + sha256 = "68db1e219d0cda1f67ac7f6b4f1de727e1dc2c11bfc705a16f83710b0d265c0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fa/thunderbird-78.13.0.tar.bz2"; - locale = "fa"; - arch = "linux-x86_64"; - sha256 = "6486a7b0923d5b689e15eb2082317127e62f050d68f887dbe410619f5c36a470"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fi/thunderbird-91.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5e6a55e1520174f9cd27a82e3634999df0703f8bbdee82fdec433f862c41daaf"; + sha256 = "90edac8bbac821f7d286ee24042c6b2e993606ea7457b9b132b0e591744d8448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fr/thunderbird-91.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7c9573fbf4a0d16e89a9f8d8fae71874cf49577b3749ba942ecb71b1b6a3a8d5"; + sha256 = "abf6c364d18fdd015654f6179be07ff701a3dfac2fcd028a5eeb6b0171da584c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/fy-NL/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/fy-NL/thunderbird-91.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6ff1fe09e82b723ebc7022744bba0cd064da2fcc7b8b92fc23475bbbea57c0fb"; + sha256 = "dc3226237442171bf23f0781ed9be5fe77fe89514dff0155a34ae224a9109132"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ga-IE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ga-IE/thunderbird-91.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "be25c020f47cf42c05dfd33338b210ad603ede6af97f8b41528d8a18be209fe3"; + sha256 = "1808e5d949005b3adc4ed40f5ed0ad5350a7c6e8e5692347b07bb7db3eb2e85a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gd/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/gd/thunderbird-91.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "65cd07e5151809ae64a905163c939bfdef60226b4fe24b9657f6de3a2c10eaa6"; + sha256 = "93592836614498d617d60aa0799957371c63747029343836da5f1afaa415cd96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/gl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/gl/thunderbird-91.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "882ed57366537562882a5e7822789a7b16d6161b8a68e7292d86741d9c3f4b95"; + sha256 = "917a816447dbc5381b14ca18331a8979aaf65c8b593376ae1dfc5a53953f6150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/he/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/he/thunderbird-91.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "115e4cb00d50dd7c5c42e94a432b04e4ac6129e1409c5b5c578594917a1b60d0"; + sha256 = "85a78253b374a4134021ff5d8bf3b8146fd864ce5cd40d60668e9130f8ff915c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hr/thunderbird-91.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "325cfc1ea9f0a8cb8bd3cb7c881e1bd84a8d8813b78618dcdc7b1ca7b4647b30"; + sha256 = "38c912e4ab89f49caaea46da01c3042764a859e541f749f94737ccd85594aaa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hsb/thunderbird-91.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c92d6bd04f71dc7379c3777186d094706ea41ad6a3e1fefa515d0a2316c7735d"; + sha256 = "b3e51840364ac97b080008fd1dc65af8ba8f827bf3867d182b0486448c118877"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hu/thunderbird-91.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ee0ab2733affbbd7f23589f1e07399ef73fd3c8901463085a67d6c9a3f6e5302"; + sha256 = "4b8e82e5726de6ce682b7e0192adb013f036dd9cd6745afc4e227074fee69ebe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/hy-AM/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/hy-AM/thunderbird-91.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "fa5b38c93c4777046213b00e6162a7afe14cafb1a3fec47383f54a9fd11a440b"; + sha256 = "43d70569709895d1ab015dc7f7f984cef05b100b360285ab51bfaef38ed41b3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/id/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/id/thunderbird-91.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a5602d079dd6ae9edbd5b1461474d858085c3250edb33573afd7f4ea2b232176"; + sha256 = "11b1a3d2f12ffef1bb434b428ae60a5c40cf7f90186d3b0e301c8422731f9959"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/is/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/is/thunderbird-91.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "eed6de442870f9c4933bef7e94019bbc386465ba5f7f2baa26de2b79973fa567"; + sha256 = "8a62b5defb2abfa1a3f37c1a0fbd890fb650aedb565da97b47def80bc7ef4349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/it/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/it/thunderbird-91.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "960c1552022ea30da269981d986b5715c971438e5d379d74fde59f18d033d862"; + sha256 = "160440d4f5bbd1d305a3de2096847a692b155a8c4da2b5e1273b2ff2a9595a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ja/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ja/thunderbird-91.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0a13ffba546db10ff44ff5c5db7d17813febdf557b8aea7d7399b6987806e8da"; + sha256 = "69ed5d8fb0822991511e70487a90f0b564d84b1f5774bbf493d2b128c49f5852"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ka/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ka/thunderbird-91.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "42b41113b2886cc35afe5ed48026d503519e8c318efad6123f5e074caa8ca425"; + sha256 = "b536d8b558296a04b6ce5cee4accca28b286ded4046f6b47f5725f79551947d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kab/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/kab/thunderbird-91.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "17f0fdf3f2697256052335808a6ad1ef81d97fc94f848c29df9e717a3e63fba8"; + sha256 = "3ff28c944d78bba5cdca8f859baa9d142e7e26f2cf31a6d3de3e38c9af4ca6af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/kk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/kk/thunderbird-91.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "94956589eeaaf7c9dd3c3c5c004907f33d6ee515d1202dad8f651cfbd1726638"; + sha256 = "ae412956e8acfb68c4a36f912940e8b8faa9d3e1240982aea9fd01ec1d86f273"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ko/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ko/thunderbird-91.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0a7efb01da1befb18111c117d2ed4c69e52de0b3f3aa24e6e3e2d0356bf645d8"; + sha256 = "a51368f6ac4efe83873d2e8208aa17b0fc8887c8d6f605ac910ad72a7f4c411c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/lt/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/lt/thunderbird-91.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "810dae8617107773cc0d0de4ed7cc4fad42282edcea81fb2b6419777d7386bae"; + sha256 = "a22d65720566d38eaa75944001d5f077ee3df3787e8b4b5220609f819474c6e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ms/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/lv/thunderbird-91.0.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha256 = "ec05e9a802dc01349d5226eeb88dbbc980c867cb037404c46e2535587463465d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ms/thunderbird-91.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ae4fdae5ca5a07e3f1b9fdd3b9eaff1cd1d8448eefb0b67cde16124514f075a3"; + sha256 = "540d7f9530515abf49909b4dce562d25f679d2e41e5871b3f8d76410ef6527fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nb-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nb-NO/thunderbird-91.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "ce73218100a0153fee49edaedc78910cfda0784ebf59ec90847b7718eb108b73"; + sha256 = "e4a6790bca7720bbf44bdd7e9dfbdc7b229a536f3054ff497917b60484095bfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nl/thunderbird-91.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "63e23bba6301b86da1df350e87d107c53bc04b5eaf54c36bb57e0140b79a1479"; + sha256 = "0f0a6ceef0a0e8a9bc05f3bf948a635a05073dc4b7750788ac94ef0ca600fe96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/nn-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/nn-NO/thunderbird-91.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "287efd5bc94297448895121c8df4fe43beaf39850ce8a82cda31d9a89a4d7b62"; + sha256 = "f13232443a5b5d89c971a07e6867ab8874dbd1fc090e9f5126af1fc3641183ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pa-IN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pa-IN/thunderbird-91.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7079c15ce806ba3cb20bb50b6c36004ffa745ac083f514b2ac5b5dece95eef89"; + sha256 = "a5ff0f2bbc3f1dc52394e3f6c28538af4caf23e9b7b58b9eea07f1df16a2c7ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pl/thunderbird-91.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "30048a59149c8ca6b9d240140826b61a777752dafa221c47738d291c51e70ccd"; + sha256 = "17326bf010c05bc718bf01f9d080c8b9987ca249809244751a87424d88ac744c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-BR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pt-BR/thunderbird-91.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "38cf30326280109a1f08de860ac1045c78b27a1dc851a7972e03e8c8d07bf6b9"; + sha256 = "dc82c57f2577ba459aa90f8394f03944c9322b40ac84d0fa9023334932888b8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/pt-PT/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/pt-PT/thunderbird-91.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ef892e822f76b00b06f088335f736552cd7c864212eadfdf4afcd4e6a7eba2dd"; + sha256 = "706e80a83dcd92c32b85da31f5c5e304342ef4f3723bfc45e8a8c0f5b415950d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/rm/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/rm/thunderbird-91.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c19dc84c5437b1126ab568a5be2c5256403511cb2624c4d5ff253f5579cdd2ab"; + sha256 = "0f616312c7e92e49062df968561096b41f20b0c62283f7647bfc35ec562ed845"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ro/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ro/thunderbird-91.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "263d6cfc4efd27849017ae3f13849f6e5be0bd7dd6a9964b6716a948705beb20"; + sha256 = "b61faa886fd34207c4453adbab6e3a83cb45b6ff204ad52d55e9bed591922b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/ru/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/ru/thunderbird-91.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "425b1544350335e5a15dc8dfe2525c6c3143e34377bb9bbfb25f9b1a688b202a"; + sha256 = "8042b28e80dccbb2d130f8eaf6c6c6d27f32072a09e6e037fc2df4ec2b4c8364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/si/thunderbird-78.13.0.tar.bz2"; - locale = "si"; - arch = "linux-x86_64"; - sha256 = "bc506ac571d49e70e330ccbfd62c566985754c7b98f8b484209128ab173a6b08"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sk/thunderbird-91.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "46b479e0085402f43446bd003ff4b9c014e888b4eec0cbcdcdf9336893ffc967"; + sha256 = "7810727d8b959ac680163a1a4c8bea093e50a8ec0a4a7b805cbc3629bf60b06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sl/thunderbird-91.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a8a70d172e8d5890394f9974208de1cf422290b6fd8e5629a31b2f7706eaaa35"; + sha256 = "fc9173ee213df06ac278ce2ead827f6ee4dfa897b232281db6d804cd49997962"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sq/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sq/thunderbird-91.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f26287b10e906805984b0beb4ea6890bfb62a82ae8138bd26b7a5febc628be7c"; + sha256 = "4447920125210987660b5fcd19c86127242a10dc2449a61d1c68fac7de1a5c5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sr/thunderbird-91.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "20fc984078efae2ddcbbe7dbd81238a79342a7fe7d1f8736594c1fb290104ed0"; + sha256 = "f88a957406464a5f8827acbfdcd716cd52807da522825e6c815e6f44c8f79691"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/sv-SE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/sv-SE/thunderbird-91.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ea67fdba6f8f3825ed1637fd7f73b9f8159c519de3920165ae58052b351c0936"; + sha256 = "71f11757b02eb9b4ab463ddb61ca283e77a7015c38b2cb1a2f3ecd21506369ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/th/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/th/thunderbird-91.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "86f069a0a4ef2e5338754e3a5de369a25b0d8fe96b3b7047dbfd009171e8fcf9"; + sha256 = "497b2c6e3af11c9a53f75db9a6765ac810a82a57e771c42126adbe424104444c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/tr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/tr/thunderbird-91.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9e975e5d8493a7f2b4dab36b5719b5a80c239820cd7d1adddb83440e9560d810"; + sha256 = "75de22f190e83058c2e85b88ae5d8775328a4257c60d17ef7be20240ffd4c2c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/uk/thunderbird-91.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a0d14c98ee3534d7eb7f0098d0fd7b8f64b4c70d5bc0bd78ea695b42babefa17"; + sha256 = "b257f216e2472628c420ed8c09ad98567256ce5d5c89748dbf7562cc2dbbc88a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/uz/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/uz/thunderbird-91.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e7d1e5b0b6a72d8b0e3611f1d4f245c46222148c1f69805a15057a85cccda9dd"; + sha256 = "6af949a5f1632e98013fe4d9254a62f4d3233cc250eded67f45db89faa82a86f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/vi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/vi/thunderbird-91.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "67a733ec644060ca58673dccf1e4e534bb1e17f7f40e0c248e6f666450ad8b07"; + sha256 = "28d8125827c79822bf24e7e14b71497b1522bac11fb55e9210b7e86066e48f99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-CN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/zh-CN/thunderbird-91.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "324c6f5c203b9ecc050bce51cf657785c7129251130efbe9f216540bbd32438c"; + sha256 = "34d6dcd8e83c5f0ee773b32a3bfdf53bfbef36f3a5a76861e68b5cdd63515dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-x86_64/zh-TW/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-x86_64/zh-TW/thunderbird-91.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e2df519a3fdfe586edac6ffb9496637df8d6ab3ba93c51c7ee979cd4b901a1e5"; + sha256 = "d67c370be24af901e29833ab4334185186366545d51c4c3c111a4044f199b927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/af/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/af/thunderbird-91.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1228035980663d4712877ccbef838522ce8e7c80d04598bc37f42972f6b01b12"; + sha256 = "0251ce2b251bb2637338618dcd2c083b1b99c4337c04b7cd6757dd28005df405"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ar/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ar/thunderbird-91.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1b4950bc1227ae4e38da2db53a381609eb836afb4ee14dd23e7f1d93db58718d"; + sha256 = "d833ebf9924458b8aac37e1de52b3a043bda6b179365fc896be8306afbdccfcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ast/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ast/thunderbird-91.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ad399d8ec5e48ee79470018df8db138791e4207156f3f7c818d24a9688b83ae4"; + sha256 = "22b051502a38aad41132e05526b4d0e881c9d66e36effaf5c0bb0730a66e4641"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/be/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/be/thunderbird-91.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "00c324154a4d2cfcd1399dec6dea9d60812c89ffb7fa7d8ad0caa699a2826f9f"; + sha256 = "ede16ceae207d1c7bfa3bf909879b701c3eac49cb4a7e133a929ee4ee89ae6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/bg/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/bg/thunderbird-91.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f3b88a019536ca8446600d5f5b35ce5d35d5dc483ae63437d2ee0ed9a8696426"; + sha256 = "a1dbe387348c427ddb9948129a2ec1f8aeb34532103def94a086e1b405c532fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/br/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/br/thunderbird-91.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d76b6774e0ca7e25687fe25936f81e80167dca6b7ef1a2cd1248be71e2bb3abd"; + sha256 = "a89b7d357349353d96d608fddb2e2279c5b8a222eab113c56aed7531ccb77848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ca/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ca/thunderbird-91.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d1a0da69ebf33a8d96110133fe91fd7799e95f303b55aec750d8a3b5ad395e49"; + sha256 = "34086af5fd1b2bf9b603f1379bf7f1ef25583f5021266f2b636853c7d047ba39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cak/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cak/thunderbird-91.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b61a9548b72fdf5e3211cf238129a17df3d8b3fdf76da3aa06cf83ff9ba43b7e"; + sha256 = "86a8f3938b8dfcd371e043effa0f6a80d2bbdf8046eb5242c8c49f43f27463a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cs/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cs/thunderbird-91.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "605b02fcbc6b1aafa261cbad5aa12d85342f9f9d9458b4a154ee23bbbc91d49b"; + sha256 = "4add72a1fd8cd104b30a51ddf5f73e1e66beb5e416a8552f84cc39c815670586"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/cy/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/cy/thunderbird-91.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "af5bf08dd943334629f60fe139392dfc957bae073bc50ec4e10bdace08b2fe1a"; + sha256 = "539d32830b885ae7790bc9367e45caaa4bd8dcde7328f8b75f6652882aab6533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/da/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/da/thunderbird-91.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ac1e4082bc78248ca1dc8760cf71901fc0e0e537b92e7dadb9af5ac9c80c49f8"; + sha256 = "ebffd062f2ede3fa1e4659781e44f1905099882e7fe2a994ea283e865bb9926e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/de/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/de/thunderbird-91.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a26ba23ae9eeaeba09d2a9fbb4fecbe87e6b5662488d7c0dded0fee89cbb5107"; + sha256 = "3f06fb893e22d9b3e27f433c3e8081c9ced29e87492a6b4c4d0660bbfd427579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/dsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/dsb/thunderbird-91.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "775d9f85cc392e2c219e2c19800d4fba8aba1762e1c7b3a2f328dc61925b9638"; + sha256 = "ff985eb9a3d697fa19d1e803a79e0964607b6803a36b7540b68b37b0ae36b3fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/el/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/el/thunderbird-91.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "d11d1c2b09d8f9e55dee43e19d64157cf040865729eb2986dbe8aeca8fabfa6f"; + sha256 = "fb463af56b39f8f22d2806174c3a79d3c57f125d88329e3dad14eb448fe21ef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-CA/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-CA/thunderbird-91.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "14691fa34a7ced54eec6a7485a5258af4934e0f07cc612588698e88fd624a07a"; + sha256 = "a86e775b7d271766efccbe851c24fcaa2e2abf45bc6099600f68f90db31a9a38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-GB/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-GB/thunderbird-91.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "919b63cd0018df0913d9f230d36e5d8124bef5afe9d224072eaa1d40dc45fa28"; + sha256 = "ee83c2d28e66acb52aa969380b2be197f14118172e2f9a9a5e683e65e2fbb3f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/en-US/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/en-US/thunderbird-91.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1fc8e76d7840ec8fccdabe4765e72555e75e027d47359e7a3f2fb092a30d2673"; + sha256 = "a96d6e6fd81b1bcebaa47901a1262b339e07321a47f82be0d913ada978f995b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-AR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/es-AR/thunderbird-91.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0c38fe5f220b3ed9f096c026e05ebfb195bf6c545e2041fd5d1f84e95bc2c238"; + sha256 = "f7454e9aa448b7f108d4a6f0b74cb943ea7cc5cafe638d7f45ed201bb5e560f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/es-ES/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/es-ES/thunderbird-91.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "db0dcd82200922451b79a00ad7660ad2e1df6a2abb84ea4ff7ebdc73a751c068"; + sha256 = "d2b2be182440b49b386cd4e4d09e1f4133f3fec08e83fa2ef23ce6de612220be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/et/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/et/thunderbird-91.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a3c802a85f607d85c97e955c45ba4e35842da4bc5bebc6dd43407c6aea546d65"; + sha256 = "4e4580b8dd9c84b7921b420b0d336bb866cd82eb93a06bb73f240cd4324f5ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/eu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/eu/thunderbird-91.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3bc5f4ceb596334fb9a570be31807898efe3684441fe9a9f96a28d16d4269864"; + sha256 = "e2b9a805c5eca39621cbe4927cdd1ecf0582e21fa78d3c27a5df6996fab51cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fa/thunderbird-78.13.0.tar.bz2"; - locale = "fa"; - arch = "linux-i686"; - sha256 = "eba6a5b4bd14860d97a71c7eabcd893c733ae52ebc5e06c9e12afda86552d35a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fi/thunderbird-91.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "77d8335a6c5fb8e302cc5a4490f6248e51e555e5d5c428116557b0cb560f2b14"; + sha256 = "1f7a337dda1d3a99e174d5d3b26630238560b30fba9a058575b041e44be15d8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fr/thunderbird-91.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2fce215ad23039c43624e897353b8b696eff73281c0739050ca5621b1ad209c2"; + sha256 = "1287c936d0f089998484bba6a32d5ee78eb866f7ae0b7bf8eaa832ce1e3796d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/fy-NL/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/fy-NL/thunderbird-91.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1c670d870e6e9cc1366467d0c0acfab98a83842442bcd3b7b2bb1d302c2cf331"; + sha256 = "0f88569ae12ac7b3b796d4bd244c242cad29224e2f11aaee7f07b30756b169d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ga-IE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ga-IE/thunderbird-91.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "77207016b5cd5204c9dcf849ec099c5bdf3bee4d79ec8ecde2cf61dc6719fb8c"; + sha256 = "556ee9841a0588de5dad84062d9d908976f46e92e45659b5ebabb7f3b8bf105d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gd/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/gd/thunderbird-91.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5ee8c00cd937b9e7c62b13c594db9138b9550ddefa0c38127f7636cdaea7e420"; + sha256 = "24059e8f399cfafc0847645a2007c958e015e8977639bae75b5bf0cc9e97b160"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/gl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/gl/thunderbird-91.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2fe3765c8dcbb2a281f7de1ae481a9f725c2df785552d840e1f65f922e94d42e"; + sha256 = "600bb0d4c4ad77074511d1bfa80f8f752d18ef06d1a861f604189581dec8011e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/he/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/he/thunderbird-91.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f63094c0bc5cdbdf0640d9281e52bcdbab517f3d72f84e4a01a120c148f39ea0"; + sha256 = "153e8e37ecca9783f1737e699f36b2cd35524e9d8ef8a57e0f0bfa96fd3ffcf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hr/thunderbird-91.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0740acd2e924fb424790a806e2fef66ad43cf53e43fbaa87ac984225616b6167"; + sha256 = "aaa099d96c0a05f8b4773483aef740fe125a83b98fe78d73b25cfec35639112a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hsb/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hsb/thunderbird-91.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "bf6d4d7230d55ec1ddb7fb9764fc182dc8468bf57663661ef7e87d0762080900"; + sha256 = "2159cabe4a9873ff6d9ca5a12c8e530a027c252f85c9d18c29248223fc402447"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hu/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hu/thunderbird-91.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a4d9f65e964787fba470c0a091edbe7a21e667ab80e1f7dd1fc76290230aa721"; + sha256 = "235a419a02ff897ba82676c2a1a38a274163fc069bb45ef6d49b04b5da575b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/hy-AM/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/hy-AM/thunderbird-91.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9718afe2417006bda611b12c42ed2dc74d397cbd6703d86ca758119535226d0f"; + sha256 = "f36574058412d452951b789610d7752a4db280a38314d4f1c54a2d7c48ecc32d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/id/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/id/thunderbird-91.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d3b9d86bddb1ed6db4a4e6456d09295d057da47aed4ad23a95021f3a2aa38ec4"; + sha256 = "9e0c91956ad10fe0ba944134ef68a0d58631d74a75804d12f3cb1a7e596ff36d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/is/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/is/thunderbird-91.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e2dc5cf9120dcaa54516393b9b14659b24a43a86809b3113724cc0480dad7a71"; + sha256 = "5b06606613bc420769b4071ef2781214c8ab918bb7653594753e655aac49282c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/it/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/it/thunderbird-91.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "66c24020386335156d2659f70570f798982f2cf36014fbb8b866f1e3870b9dcb"; + sha256 = "b9d3f3e1a03a256a0c4b835d3b93ca220217f8d628ac05513ff161126effa385"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ja/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ja/thunderbird-91.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ece2f1660ef41a31ae4116a32b9b025547a419fcbd8612d1a36d9bc0b9e821af"; + sha256 = "5ba904085b47370f414d74761394f6ddc71aa3c0fac9cdc023661b70bc708d14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ka/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ka/thunderbird-91.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b549016df313c46518ee50c03b7f075c78feefeaadfd5a5c0ec2508d0607d999"; + sha256 = "9ae8fecd564a1a8e8c6db848e05adc4655baf42e8b4602c28965a3ee76c5d1d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kab/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/kab/thunderbird-91.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c56fe1f7051a47c05834a7378313b24fe8fdbbd816692dcaeefaf3635f09eab9"; + sha256 = "a9cde5c6b4c41d0ccfedacd5eeb9f6ef946282cf07bc98c45704bb5f7b4b6210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/kk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/kk/thunderbird-91.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "86594f4e1d92d495c76bbe20cadeb3bea74d5f57a4b3155edd01ff4f62c5f1a5"; + sha256 = "4710e947dcb3bba71d187ad828ad09011183ef104758e7d79c8dbc528f9460fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ko/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ko/thunderbird-91.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "47c8cb4a58643c56f005fa36b0790344546f5efad5446c2b5b49040906eb9339"; + sha256 = "1b4d7ce21c95ecd2510bd073bdf74e0d7f748ef69d32adc2eefdb0fae42fd717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/lt/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/lt/thunderbird-91.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e3afe316e77d4c33e936574f32c3d477643b51fd0f0f228d52cce676c8ab4f82"; + sha256 = "ed69b146a789715f51ed78132a4f32c12afae67847faea9629371221e99e4a8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ms/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/lv/thunderbird-91.0.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha256 = "6562ae94bd90af19778df1157da2ee39b9da4ae164111c60adae1064400bcefc"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ms/thunderbird-91.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "626dd1acb63356a2f531095833b0e697231009f5b0c51f401a17e8551b21a32d"; + sha256 = "812a399146c30e6532eb57597df9a08cce7d769a57df6efd17230db75405be08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nb-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nb-NO/thunderbird-91.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fe236ce5d719b3ac205f47ab4837ea3ad5d6f2817c44e2e562b0a011480a91ce"; + sha256 = "ac5b0231d8bfbc9d318579dd97c3a4e49d723797224cf3f4e1591520ce9c9e07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nl/thunderbird-91.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33fb2a46384f38e887575297ad495eaaea0ff0910b59cc05ea4512dd9498b9eb"; + sha256 = "fb6f8a3e79ec3c41201ef3595608cbc24c2070baee0a60c2fc489ef391db9fa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/nn-NO/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/nn-NO/thunderbird-91.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5e724e31b26ae96a0b535495dd10b77c954a5a043e0353fd17962601ec042e3c"; + sha256 = "e258d8ae0b1ee94386015168d6ebbe31ddd69c513a9badbe6b6a910e0ef3f6df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pa-IN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pa-IN/thunderbird-91.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ee1db2f6e9000ff4ca6ba4fd4b758109ea0f94d066fad9c20020e75935f5fc05"; + sha256 = "c96de96b276ddff6f6a9592dd1505df946e8c1dd80a0133c039e6969508e1377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pl/thunderbird-91.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b09d9c4655b4c32b9554b83fdd2b2635586b9d8f669ec39f5722e7ac8175b79e"; + sha256 = "de159419d5e0123379604cae0e482d8cb3ddd8aa2d879113142e87f809ae3aeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-BR/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pt-BR/thunderbird-91.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f774513c0c23794c69112b962999512485beaa2a97517b06e335e4fce5b23d9a"; + sha256 = "7b58d79a7710669427076bba99d3d6b32e08643a77f722bdc6b89378c943b497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/pt-PT/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/pt-PT/thunderbird-91.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "39f0f2fd17ea216acc5383f3c65e4da8928d56e4b8bdf2d1bb76d6dfc8491ec1"; + sha256 = "dbbca7893c6d504b493936d1ca364e52da45a71cab69a59ec0352ca68d47b0a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/rm/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/rm/thunderbird-91.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3a966692544873281adf12a850ae904e1304ce08d8bd09ede0ad8b0cf66b5f09"; + sha256 = "98649ae64eb9a8d93f7ecfd699e02e8eae5ac0a2a2e837f0704df7772ed44097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ro/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ro/thunderbird-91.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4514976e0a5d433b64fc28e42f3baca52e871f7c99434e2993984dda9025b370"; + sha256 = "479d886c83f53bcb96ea12ddd27f7134fdfa482800337f9c7cef8d8762710839"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/ru/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/ru/thunderbird-91.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "97915e34bbbf036fbe8093bdf79a426181c57b78bd8d8b7f99b97fd1c3dceb7c"; + sha256 = "c371992e54bf74571596d4b295a10fb00495017c3e40665e6d3d698d9da03bc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/si/thunderbird-78.13.0.tar.bz2"; - locale = "si"; - arch = "linux-i686"; - sha256 = "e27e823a4a6141141b92c2c1c55cd77e591d3e2b05d0fa6cc9502b4bc21e67a8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sk/thunderbird-91.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ff4d89bc1e0ae8d10dc8dcf377c4b3c45ab1db38c0489ca328e0a8f3145772c6"; + sha256 = "95a4e41e6be48bdc4da11864b02d326a85a0dc29faf4acd2297dff03b874e8f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sl/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sl/thunderbird-91.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "27d34b8508afa306d6ce94e73a2251071cf4480c5f55cc087597e56511e85173"; + sha256 = "36e702b13f5c3a75625fb0dfc15403438282acda703c372c69f9c865a26baba3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sq/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sq/thunderbird-91.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3fb60c21d42ae9a961838081c12eea7e98e43a27ebc24ef7470e912bf13053ca"; + sha256 = "0ff2b572ab9751eab4791f960d0f1d4b6658f296251fefb5987b92317c8521e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sr/thunderbird-91.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "dab84cca4db8412b3ce40690e7b31df1d66b06979cb39f4efd8206684a802edc"; + sha256 = "37798d5093c0f6846984e830fe8a371e7facc2e710874b40774f038aeda7a6ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/sv-SE/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/sv-SE/thunderbird-91.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cec350da20515ca0e5b317264e3969e1465e9d055de743c130c4011d5f3cc825"; + sha256 = "71e34f95f97ea4cf2e213d60f170ade0de5f199b37ba103ee08b2de568d9af7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/th/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/th/thunderbird-91.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0a8302af0995624d37c71757c851e8ba3ffdcbe89d90023c69c5f69a6ec888b7"; + sha256 = "385b0dc2137c97976d7cb9f49502f13723865071099c97d0cb9b73cac18fe853"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/tr/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/tr/thunderbird-91.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8c7013e71cd57795f0bddc5061b24e43fcd5b1f23abc7c1653ad345869d73b24"; + sha256 = "6dd8bb7b49ece0b4b21216bbe4be831bc49c6bcf44d973d5bf4c37372aa6285d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uk/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/uk/thunderbird-91.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ed9a30630c0821b515a2984257d6dc19410ca1f6a723e856bfe8758ad32b11f1"; + sha256 = "2bd6803f23fc17b9530055e912e2ff6cdc0284f1c656965a88b50d6adee67e08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/uz/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/uz/thunderbird-91.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b834c2f59b3945a362d1ace0dd5b6275a1ba90587c8fcb894678a188301f3848"; + sha256 = "72e0727bb25cfc0d73b81cf782d4e37e6d72f0807284c8f057aa220690047185"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/vi/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/vi/thunderbird-91.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "9f724e2c2e3faf0ad1d1ac6d08f8bc595ad16b408d7e712e3fc2f51b3d6f2a95"; + sha256 = "43a6b740ee93cc0ce99ba2d9fb6ddbae1004c53d209bdb3a4b92c5f685d7bf62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-CN/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/zh-CN/thunderbird-91.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7c8f7982d035bebf250542232d782834709becd60c766e6bd85a617bc6a443bd"; + sha256 = "bdfc475d49cd201f8685fab59e273425741335d7c1f83abce7c79cca45116473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.13.0/linux-i686/zh-TW/thunderbird-78.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0/linux-i686/zh-TW/thunderbird-91.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a4c90eb3a5bf2fcd04b40b60e976accda049d10666e487f477c8d154c8928be5"; + sha256 = "2c3a20d639c793853ae57e850f15910ea3a9d35b1900ae8dc4d14689df080c42"; } ]; } diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index a49262e7cb65..1fb4693d64a2 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-Ns8vSS/PDlfopigW4Nz3fdR9PCMG8gDoL36+/s0Qkeo="; + sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI="; }; - cargoSha256 = "sha256-NDtldiVo4SyE88f6ntKn1WJDFdvwN5Ps4DxQH15iNZE="; + cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 89bdd979fea0..90a4aeb4f8ab 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -1,6 +1,12 @@ { fetchurl -, lib, stdenv -, ocaml, isabelle, cvc3, perl, wget, which +, lib +, stdenv +, ocaml +, isabelle +, cvc3 +, perl +, wget +, which }: stdenv.mkDerivation rec { @@ -13,8 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml isabelle cvc3 perl wget which ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -pv "$out" export HOME="$out" @@ -45,9 +49,9 @@ stdenv.mkDerivation rec { and scalable to large system specifications. It provides a consistent abstraction over the various “backend” verifiers. ''; - homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; + homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index ef2d97ef6bfc..21c60d03ac1e 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,13 @@ -{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib, wrapGAppsHook +{ lib +, fetchzip +, makeWrapper +, makeDesktopItem +, stdenv +, gtk3 +, libXtst +, glib +, zlib +, wrapGAppsHook }: let @@ -17,7 +25,8 @@ let }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "tla-toolbox"; version = "1.7.1"; src = fetchzip { @@ -31,8 +40,6 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; - phases = [ "installPhase" ]; - installPhase = '' runHook preInstall diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index eafa8930371c..378fd7df01a6 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,23 +4,19 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "367"; + version = "368"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "07y51l06n344pjyxdddq6sdvxw25nl10irl4avynkqjnqyqsiw97"; + sha256 = "L/UWmTC2tJ7wuvteEzHJTxqYwxBEK7p3mK3YIcdq5xI="; }; strictDeps = true; - nativeBuildInputs = [ - makeWrapper - pkg-config - fontconfig - ]; + nativeBuildInputs = [ makeWrapper pkg-config fontconfig ]; buildInputs = [ xorg.libXaw diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index d3f87f879c59..a4b03e91501d 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "xplayer"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1xcv6nr2gc0vji5afwy283v7bgx46kzgrq79hl8q9pz995qq2kbp"; + sha256 = "sha256-qoBJKY0CZyhp9foUehq5hInEENRGZuy1D6jAMjbjYhA="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but diff --git a/pkgs/applications/virtualization/containerd/1.4.nix b/pkgs/applications/virtualization/containerd/1.4.nix new file mode 100644 index 000000000000..e4f743013b27 --- /dev/null +++ b/pkgs/applications/virtualization/containerd/1.4.nix @@ -0,0 +1,53 @@ +{ lib +, fetchFromGitHub +, buildGoPackage +, btrfs-progs +, go-md2man +, installShellFiles +, util-linux +, nixosTests +}: + +buildGoPackage rec { + pname = "containerd"; + version = "1.4.9"; + + src = fetchFromGitHub { + owner = "containerd"; + repo = "containerd"; + rev = "v${version}"; + sha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52"; + }; + + goPackagePath = "github.com/containerd/containerd"; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; + + buildInputs = [ btrfs-progs ]; + + buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; + + buildPhase = '' + cd go/src/${goPackagePath} + patchShebangs . + make binaries man $buildFlags + ''; + + installPhase = '' + install -Dm555 bin/* -t $out/bin + installManPage man/*.[1-9] + installShellCompletion --bash contrib/autocomplete/ctr + installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + ''; + + passthru.tests = { inherit (nixosTests) docker; }; + + meta = with lib; { + homepage = "https://containerd.io/"; + description = "A daemon to control runC"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ec358507c2d2..a1821aa2a316 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -12,7 +12,7 @@ rec { # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp @@ -33,7 +33,7 @@ rec { patches = []; }); - docker-containerd = containerd.overrideAttrs (oldAttrs: { + docker-containerd = containerd_1_4.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -210,7 +210,7 @@ rec { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ]; + maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ]; platforms = with platforms; linux ++ darwin; }; @@ -221,20 +221,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.7"; + version = "20.10.8"; rev = "v${version}"; - sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3"; + sha256 = "sha256-betZIAH4mFpb/OywWyixCjVmy5EGTrg+WbxDXkVRrsI="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw"; + sha256 = "1pjjdwzad2z337zwby88w5zwl71ch4lcwbw0sy8slvyjv387jjlm"; }; - runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 - runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; - containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1 - containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d"; - tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 + runcRev = "v1.0.1"; # v1.0.1 + runcSha256 = "1zfa1zr8i9n1915nyv7hyaj7q27cy7fiihk9rr1377ayaqg3mpn5"; + containerdRev = "v1.4.9"; # v1.4.9 + containerdSha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52"; + tiniRev = "v0.19.0"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index e474bb81719c..764d632ee415 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8977803787241e1474bdbb35cbc704c57cce6fcd", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8977803787241e1474bdbb35cbc704c57cce6fcd.tar.gz", - "sha256": "1ivdqlmpdqpa5m5cdwdk6l258nmnz9a6466y8xs19x0wkdx4b738", - "msg": "Update from Hackage at 2021-08-07T10:52:35Z" + "commit": "dfb0b040033334d2e676906786c7a90805310e7d", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz", + "sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg", + "msg": "Update from Hackage at 2021-08-10T19:15:27Z" } diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index ca57640e4abe..d23733fb0312 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2021.04.21"; + version = "2021.07.14"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-nkwCsqlxDfTb2zJ8OWEujLuuZJWYev7drrqyjB6j2Po="; + sha256 = "sha256-Li3SFqXxoxC4SXdK9j5jCdlMIgfDR3GlNMR64YsWJ0I="; }; dontBuild = true; diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix index d467526582c5..5cbf4c192085 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "2.0"; + version = "10.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1si0gaa1njyf4194i6rbx4qjp31sw238svvb2x8r8cfhm8mkhm8d"; + sha256 = "0qihxipk7ya6n3p9kg20bk6plnb85pg3ahwd02qq4bqfiw6mx3gw"; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 7be80048e3c2..011c5c2906f4 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xapps"; - version = "2.0.6"; + version = "2.2.3"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "11qbz547qlfsvkz4bdxhryrsf10aw5jc2f1glbik7pvmmm87gf4f"; + sha256 = "sha256-hrSyoHA3XQXQb9N3YJ+NNfBjJNOuUhXhKEimh/n73MM="; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 53e88ddb947d..20c36827cb08 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "2.8.3"; + version = "3.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0h3qgqaiz5swy09fr6z3ag2952hgzsk5d2fpwmwb78yjrzrhnzpy"; + sha256 = "sha256-hvoTb9afyVdcm5suB1ZxkxUyNFSVRFjYuNVc0jE3RF0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 7f84e2360704..9c2ed1ea22b6 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -1,21 +1,25 @@ { lib, stdenv, fetchurl }: -{ pkg, version, sha256 -, meta ? {} +{ pkg +, version +, sha256 +, meta ? { } }: with lib; stdenv.mkDerivation ({ - name = "hex-source-${pkg}-${version}"; + pname = "hex-source-${pkg}"; + inherit version; + dontBuild = true; + dontConfigure = true; + dontFixup = true; src = fetchurl { url = "https://repo.hex.pm/tarballs/${pkg}-${version}.tar"; inherit sha256; }; - phases = [ "unpackPhase" "installPhase" ]; - unpackCmd = '' tar -xf $curSrc contents.tar.gz mkdir contents diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index d858b3d81aff..31bef024d320 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,27 +1,36 @@ { lib, stdenv, rebar3 }: -{ name, version, sha256, src -, meta ? {} +{ name +, version +, sha256 +, src +, meta ? { } }: with lib; stdenv.mkDerivation ({ - name = "rebar-deps-${name}-${version}"; + pname = "rebar-deps-${name}"; + inherit version; - phases = [ "downloadPhase" "installPhase" ]; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; - downloadPhase = '' + prePhases = '' cp ${src} . HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps ''; installPhase = '' + runHook preInstall mkdir -p "$out/_checkouts" for i in ./_build/default/lib/* ; do echo "$i" cp -R "$i" "$out/_checkouts" done + runHook postInstall ''; outputHashAlgo = "sha256"; diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 1d75966797b6..4686a387712f 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -158,9 +158,15 @@ let (lib.enableFeature enablePlugin "plugin") ] - # Support -m32 on powerpc64le + # Support -m32 on powerpc64le/be ++ lib.optional (targetPlatform.system == "powerpc64le-linux") "--enable-targets=powerpcle-linux" + ++ lib.optional (targetPlatform.system == "powerpc64-linux") + "--enable-targets=powerpc-linux" + + # Fix "unknown long double size, cannot define BFP_FMT" + ++ lib.optional (targetPlatform.isPower && targetPlatform.isMusl) + "--disable-decimal-float" # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 685497b3037a..35c0bd76214d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -311,6 +311,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; # ghcHEAD times out on aarch64-linux on Hydra. hydraPlatforms = builtins.filter (p: p != "aarch64-linux") ghc.meta.platforms; diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index b21f0196d4b4..16a7552dd4e3 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.5.0"; + pname = "gprolog"; + version = "1.5.0"; src = fetchurl { urls = [ - "mirror://gnu/gprolog/${name}.tar.gz" - "http://www.gprolog.org/${name}.tar.gz" + "mirror://gnu/gprolog/gprolog-${version}.tar.gz" + "http://www.gprolog.org/gprolog-${version}.tar.gz" ]; sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-install-dir=$out" "--without-links-dir" - "--with-examples-dir=$out/share/${name}/examples" - "--with-doc-dir=$out/share/${name}/doc" + "--with-examples-dir=$out/share/gprolog-${version}/examples" + "--with-doc-dir=$out/share/gprolog-${version}/doc" ) ''; postInstall = '' - mv -v $out/[A-Z]* $out/gprolog.ico $out/share/${name}/ + mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/ ''; doCheck = true; diff --git a/pkgs/development/arduino/arduino-ci/default.nix b/pkgs/development/embedded/arduino/arduino-ci/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-ci/default.nix rename to pkgs/development/embedded/arduino/arduino-ci/default.nix diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-cli/default.nix rename to pkgs/development/embedded/arduino/arduino-cli/default.nix diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-core/default.nix rename to pkgs/development/embedded/arduino/arduino-core/default.nix diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/embedded/arduino/arduino-core/downloads.nix similarity index 100% rename from pkgs/development/arduino/arduino-core/downloads.nix rename to pkgs/development/embedded/arduino/arduino-core/downloads.nix diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/embedded/arduino/arduino-mk/default.nix similarity index 100% rename from pkgs/development/arduino/arduino-mk/default.nix rename to pkgs/development/embedded/arduino/arduino-mk/default.nix diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/embedded/arduino/ino/default.nix similarity index 100% rename from pkgs/development/arduino/ino/default.nix rename to pkgs/development/embedded/arduino/ino/default.nix diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix similarity index 100% rename from pkgs/development/tools/misc/avrdude/default.nix rename to pkgs/development/embedded/avrdude/default.nix diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix similarity index 100% rename from pkgs/development/tools/misc/blackmagic/default.nix rename to pkgs/development/embedded/blackmagic/default.nix diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/embedded/blackmagic/helper.sh similarity index 100% rename from pkgs/development/tools/misc/blackmagic/helper.sh rename to pkgs/development/embedded/blackmagic/helper.sh diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/pkgs/development/embedded/bossa/bin2c.c similarity index 100% rename from pkgs/development/tools/misc/bossa/bin2c.c rename to pkgs/development/embedded/bossa/bin2c.c diff --git a/pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch b/pkgs/development/embedded/bossa/bossa-no-applet-build.patch similarity index 100% rename from pkgs/development/tools/misc/bossa/bossa-no-applet-build.patch rename to pkgs/development/embedded/bossa/bossa-no-applet-build.patch diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix similarity index 100% rename from pkgs/development/tools/misc/bossa/default.nix rename to pkgs/development/embedded/bossa/default.nix diff --git a/pkgs/development/tools/misc/cc-tool/default.nix b/pkgs/development/embedded/cc-tool/default.nix similarity index 100% rename from pkgs/development/tools/misc/cc-tool/default.nix rename to pkgs/development/embedded/cc-tool/default.nix diff --git a/pkgs/development/tools/misc/easypdkprog/default.nix b/pkgs/development/embedded/easypdkprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/easypdkprog/default.nix rename to pkgs/development/embedded/easypdkprog/default.nix diff --git a/pkgs/development/tools/misc/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix similarity index 100% rename from pkgs/development/tools/misc/apio/default.nix rename to pkgs/development/embedded/fpga/apio/default.nix diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix similarity index 100% rename from pkgs/development/tools/ecpdap/default.nix rename to pkgs/development/embedded/fpga/ecpdap/default.nix diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/fujprog/default.nix rename to pkgs/development/embedded/fpga/fujprog/default.nix diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/embedded/fpga/icestorm/default.nix similarity index 100% rename from pkgs/development/tools/icestorm/default.nix rename to pkgs/development/embedded/fpga/icestorm/default.nix diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/embedded/fpga/lattice-diamond/default.nix similarity index 100% rename from pkgs/development/tools/lattice-diamond/default.nix rename to pkgs/development/embedded/fpga/lattice-diamond/default.nix diff --git a/pkgs/development/tools/misc/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix similarity index 100% rename from pkgs/development/tools/misc/openfpgaloader/default.nix rename to pkgs/development/embedded/fpga/openfpgaloader/default.nix diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/tinyprog/default.nix rename to pkgs/development/embedded/fpga/tinyprog/default.nix diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix similarity index 100% rename from pkgs/development/tools/trellis/default.nix rename to pkgs/development/embedded/fpga/trellis/default.nix diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/embedded/gputils/default.nix similarity index 100% rename from pkgs/development/tools/misc/gputils/default.nix rename to pkgs/development/embedded/gputils/default.nix diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix similarity index 100% rename from pkgs/development/tools/misc/openocd/default.nix rename to pkgs/development/embedded/openocd/default.nix diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix similarity index 100% rename from pkgs/development/arduino/platformio/chrootenv.nix rename to pkgs/development/embedded/platformio/chrootenv.nix diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix similarity index 100% rename from pkgs/development/arduino/platformio/core.nix rename to pkgs/development/embedded/platformio/core.nix diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix similarity index 100% rename from pkgs/development/arduino/platformio/default.nix rename to pkgs/development/embedded/platformio/default.nix diff --git a/pkgs/development/arduino/platformio/fix-searchpath.patch b/pkgs/development/embedded/platformio/fix-searchpath.patch similarity index 100% rename from pkgs/development/arduino/platformio/fix-searchpath.patch rename to pkgs/development/embedded/platformio/fix-searchpath.patch diff --git a/pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch b/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch similarity index 100% rename from pkgs/development/arduino/platformio/missing-udev-rules-nixos.patch rename to pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch similarity index 100% rename from pkgs/development/arduino/platformio/use-local-spdx-license-list.patch rename to pkgs/development/embedded/platformio/use-local-spdx-license-list.patch diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix similarity index 100% rename from pkgs/development/tools/rshell/default.nix rename to pkgs/development/embedded/rshell/default.nix diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/embedded/stm32/betaflight/default.nix similarity index 100% rename from pkgs/development/misc/stm32/betaflight/default.nix rename to pkgs/development/embedded/stm32/betaflight/default.nix diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/embedded/stm32/inav/default.nix similarity index 100% rename from pkgs/development/misc/stm32/inav/default.nix rename to pkgs/development/embedded/stm32/inav/default.nix diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix similarity index 100% rename from pkgs/development/tools/misc/stm32cubemx/default.nix rename to pkgs/development/embedded/stm32/stm32cubemx/default.nix diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/embedded/stm32/stm32flash/default.nix similarity index 100% rename from pkgs/development/tools/misc/stm32flash/default.nix rename to pkgs/development/embedded/stm32/stm32flash/default.nix diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix similarity index 100% rename from pkgs/development/tools/misc/teensy-loader-cli/default.nix rename to pkgs/development/embedded/teensy-loader-cli/default.nix diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/embedded/uisp/default.nix similarity index 100% rename from pkgs/development/tools/misc/uisp/default.nix rename to pkgs/development/embedded/uisp/default.nix diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix similarity index 100% rename from pkgs/development/tools/misc/xc3sprog/default.nix rename to pkgs/development/embedded/xc3sprog/default.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6683dcc55bb1..98482e03a877 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1458,6 +1458,10 @@ self: super: { addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative ); + # Readline uses Distribution.Simple from Cabal 2, in a way that is not + # compatible with Cabal 3. No upstream repository found so far + readline = appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch; + # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { http-client = self.http-client_0_7_8; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 11a78272fa4b..a6fafbe8a900 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -735,6 +735,7 @@ broken-packages: - compilation - complex-generic - compose-trans + - composite-dhall - composite-opaleye - composition-tree - comprehensions-ghc @@ -2558,6 +2559,7 @@ broken-packages: - jenga - jenkinsPlugins2nix - jespresso + - jet-stream - jinquantities - jml-web-service - jni @@ -3898,7 +3900,6 @@ broken-packages: - read-bounded - read-ctags - read-io - - readline - readme-lhs - readshp - really-simple-xml-parser diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fe7cf4b21597..1c74de902d63 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -58,7 +58,6 @@ dont-distribute-packages: - CC-delcont-alt - CMCompare - CPBrainfuck - - CPL - CSPM-Interpreter - CSPM-ToProlog - CSPM-cspm @@ -371,8 +370,6 @@ dont-distribute-packages: - XSaiga - YACPong - Yablog - - Yogurt - - Yogurt-Standalone - Z-Botan - Z-IO - Z-MessagePack @@ -1559,7 +1556,6 @@ dont-distribute-packages: - hoodle-publish - hoodle-render - hoovie - - hoq - hp2any-graph - hp2any-manager - hpaco @@ -1613,7 +1609,6 @@ dont-distribute-packages: - hset - hsfacter - hslogstash - - hsnock - hspec-expectations-pretty - hspec-pg-transact - hspec-setup @@ -1655,7 +1650,6 @@ dont-distribute-packages: - hunt-searchengine - hunt-server - hurdle - - husky - huzzy - hw-all - hw-dsv @@ -1973,6 +1967,8 @@ dont-distribute-packages: - llvm-tools - lmonad-yesod - lnd-client + - lnurl + - lnurl-authenticator - local-search - localize - locked-poll @@ -2078,7 +2074,6 @@ dont-distribute-packages: - minecraft-data - minesweeper - mini-egison - - miniforth - minilight-lua - minimung - minioperational @@ -2087,7 +2082,6 @@ dont-distribute-packages: - missing-py2 - mixed-strategies - mkbndl - - mkcabal - mlist - mmark-cli - mmark-ext @@ -2107,6 +2101,7 @@ dont-distribute-packages: - monetdb-mapi - mongrel2-handler - monky + - monomer - monte-carlo - moo - moo-nad @@ -2385,6 +2380,7 @@ dont-distribute-packages: - postgresql-tx-query - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple + - postgrest_8_0_0 - postmark - potoki - potoki-cereal @@ -2449,7 +2445,6 @@ dont-distribute-packages: - queryparser-hive - queryparser-presto - queryparser-vertica - - questioner - queuelike - quickbench - quickcheck-combinators @@ -2513,7 +2508,6 @@ dont-distribute-packages: - reactive-fieldtrip - reactive-glut - reactor - - readline-statevar - readpyc - reanimate - record-aeson @@ -2899,7 +2893,6 @@ dont-distribute-packages: - svg2q - svgone - swapper - - swearjure - sweet-egison - switch - sylvia @@ -3041,7 +3034,6 @@ dont-distribute-packages: - twidge - twilight-stm - twill - - twitter - twitter-enumerator - type-assertions - type-cache diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8042c63fbc0e..e916800ba87f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2483,7 +2483,6 @@ self: { ]; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "CSPM-CoreLanguage" = callPackage @@ -11589,8 +11588,8 @@ self: { }: mkDerivation { pname = "Jikka"; - version = "5.1.0.0"; - sha256 = "0zr558lds5gqlgdpxgm65zjm4frcln50wr9q01djjq3441cxciqf"; + version = "5.2.0.0"; + sha256 = "0rg96x1y928dd8n2znddp8b2wgmpv6vdkm4s8xcr39rqw4jsqk0l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -13766,8 +13765,8 @@ self: { pname = "MonadRandom"; version = "0.5.3"; sha256 = "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617"; - revision = "1"; - editedCabalFile = "1wpgmcv704i7x38jwalnbmx8c10vdw269gbvzjxaj4rlvff3s4sq"; + revision = "2"; + editedCabalFile = "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -21918,7 +21917,6 @@ self: { ]; description = "A MUD client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Yogurt-Standalone" = callPackage @@ -21938,7 +21936,6 @@ self: { executableSystemDepends = [ readline ]; description = "A functional MUD client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) readline;}; "Z-Botan" = callPackage @@ -44686,19 +44683,19 @@ self: { }) {}; "bnb-staking-csvs" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, hedgehog, req - , scientific, tasty, tasty-hedgehog, tasty-hunit, text, time + ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs + , cointracking-imports, hedgehog, req, scientific, tasty + , tasty-hedgehog, tasty-hunit, text, time }: mkDerivation { pname = "bnb-staking-csvs"; - version = "0.1.0.0"; - sha256 = "0dy68qklr8zajcmw4zff921n35j99klgndpgpq0ra9k3g6n22gkn"; - revision = "1"; - editedCabalFile = "0pjrkqkjyq3hl14q7k9sx2xia06z06lv2i1sfs0vbcc3fh1s3wn1"; + version = "0.2.0.0"; + sha256 = "1m2bd6cwlgavq3nri3xwbqim2zikzv1dxqf5a5gxkqra1qgbvm4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cassava req scientific text time + aeson base bytestring cassava cmdargs cointracking-imports req + scientific text time ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -47593,6 +47590,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "byte-count-reader_0_10_1_4" = callPackage + ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text + }: + mkDerivation { + pname = "byte-count-reader"; + version = "0.10.1.4"; + sha256 = "1rscz0dqz8h4cazf1kb0w628a93ysphrih5x0yppvl3w0iy26sh0"; + libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; + testHaskellDepends = [ + base extra hspec parsec parsec-numbers text + ]; + description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "byte-order" = callPackage ({ mkDerivation, base, primitive, primitive-unaligned }: mkDerivation { @@ -51154,8 +51167,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.11.0.0"; - sha256 = "1pbgnaiv1zlykpc13vgr5aklfjc2bl84nz8fpvga5djjd0x905cw"; + version = "0.12.0.0"; + sha256 = "0wv1rp511vzq7hkzcgcpa0jvc90bflysddz0s69dzl6llr71gb6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53858,20 +53871,18 @@ self: { "chassis" = callPackage ({ mkDerivation, base, bytestring, comonad, composite-base - , containers, contravariant, distributive, either, exceptions - , extra, first-class-families, path, profunctors, rio, text, time - , vinyl + , containers, distributive, extra, first-class-families, path + , profunctors, text, time, vinyl }: mkDerivation { pname = "chassis"; - version = "0.0.5.0"; - sha256 = "0f9iipl7l9jhi6754yysk9kkliiab60ds95k8r4gjcch3hh4zbcj"; + version = "0.0.6.0"; + sha256 = "0lb2hkyzyq7rm3h6s5n16v4zvqsan98p3k3a1fig9gf61538rkvy"; libraryHaskellDepends = [ - base bytestring comonad composite-base containers contravariant - distributive either exceptions extra first-class-families path - profunctors rio text time vinyl + base bytestring comonad composite-base containers distributive + extra first-class-families path profunctors text time vinyl ]; - description = "Prelude with algebraic constructs and polykinds on"; + description = "Polykinded Prelude Kernel"; license = lib.licenses.mit; }) {}; @@ -54377,6 +54388,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "chimera_0_3_2_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, mtl, QuickCheck + , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, vector + }: + mkDerivation { + pname = "chimera"; + version = "0.3.2.0"; + sha256 = "1p8in1a37hrb0qwvabwi4a9ahzydkd8j3v402cn2i3xmkzcr0kh9"; + libraryHaskellDepends = [ + adjunctions base distributive mtl vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base mtl random tasty-bench ]; + description = "Lazy infinite streams with O(1) indexing and applications for memoization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chiphunk" = callPackage ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar , vector-space @@ -58669,6 +58702,27 @@ self: { broken = true; }) {}; + "cointracking-imports" = callPackage + ({ mkDerivation, base, base-compat-batteries, bytestring, cassava + , filepath, hedgehog, lens, scientific, tasty, tasty-hedgehog + , tasty-hunit, text, time, xlsx + }: + mkDerivation { + pname = "cointracking-imports"; + version = "0.1.0.1"; + sha256 = "19in8n8sigcbph29cgrbg1ccbxzadav1siryfjfc1g112p6mrf91"; + libraryHaskellDepends = [ + base base-compat-batteries bytestring cassava filepath lens + scientific text time xlsx + ]; + testHaskellDepends = [ + base base-compat-batteries bytestring cassava filepath hedgehog + lens scientific tasty tasty-hedgehog tasty-hunit text time xlsx + ]; + description = "Generate CSV & XLSX files for importing into CoinTracking"; + license = lib.licenses.bsd3; + }) {}; + "colada" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores @@ -60132,6 +60186,8 @@ self: { pname = "compdoc"; version = "0.3.0.0"; sha256 = "07gbs64r8qsxw4j0mlk7kldbdjjzz4v34pm8b5cj7a6r1l33w7k5"; + revision = "3"; + editedCabalFile = "1k9hahs857mg72krmhb0n1igfqy344pnlllbishrrj6hknc84xfq"; libraryHaskellDepends = [ aeson base composite-aeson composite-aeson-throw composite-base pandoc pandoc-throw path rio vinyl @@ -60496,16 +60552,21 @@ self: { }) {}; "composite-dhall" = callPackage - ({ mkDerivation, base, composite-base, dhall, lens, text }: + ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit + , text, vinyl + }: mkDerivation { pname = "composite-dhall"; - version = "0.0.1.0"; - sha256 = "1hhy3incp4j8n0c8jyk12qi9zgxmwqpvb08zhc8rql855g88rpfq"; - revision = "3"; - editedCabalFile = "0c6mim2i1bzdnm19cglm01i6kf0yka8i5nwjl7wcczvqy27fqlrz"; - libraryHaskellDepends = [ base composite-base dhall lens text ]; + version = "0.0.3.0"; + sha256 = "1ynamdgamlri6ll0vh02kp4iy04vgsplsrda49by1b4vc9b4hcdz"; + libraryHaskellDepends = [ base composite-base dhall text vinyl ]; + testHaskellDepends = [ + base composite-base dhall tasty tasty-hunit text vinyl + ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-ekg" = callPackage @@ -60533,6 +60594,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-lens-extra" = callPackage + ({ mkDerivation, base, composite-base, lens, vinyl }: + mkDerivation { + pname = "composite-lens-extra"; + version = "0.0.1.0"; + sha256 = "1dcasjymwkgkbpx0ynmdagpazfdnrjidvn5fywnm1jf1r08armzy"; + libraryHaskellDepends = [ base composite-base lens vinyl ]; + description = "Extra lens functions for composite"; + license = lib.licenses.mit; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -74929,6 +75001,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.5"; sha256 = "0dz617kfkvjf3f2zbphkdx1scglcjj162qsfk9xj7slbapnj918m"; + revision = "1"; + editedCabalFile = "0rcj755n729gs9rgmjwai1xacigwpyk4b91x0cadfsl7xrgqax0c"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -76334,25 +76408,26 @@ self: { }) {}; "diohsc" = callPackage - ({ mkDerivation, asn1-types, base, bytestring, containers - , cryptonite, data-default-class, data-hash, directory + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, cryptonite, data-default-class, data-hash, directory , drunken-bishop, exceptions, filepath, haskeline, hourglass, iconv - , mime, mtl, network, network-simple, network-uri, parsec, pem - , process, regex-compat, safe, temporary, terminal-size, text, tls - , transformers, unix, x509, x509-store, x509-validation + , memory, mime, mtl, network, network-simple, network-uri, parsec + , pem, process, regex-compat, safe, temporary, terminal-size, text + , tls, transformers, unix, x509, x509-store, x509-validation }: mkDerivation { pname = "diohsc"; - version = "0.1.7"; - sha256 = "0xhpj1dhcppvxv8558aai1azx8i3awv4adwl0vffzwj2kas23gjm"; + version = "0.1.8"; + sha256 = "0a614db90pwfc689gb174af6q5fdrb6i9bvhjgvq8vkgldicg4wb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - asn1-types base bytestring containers cryptonite data-default-class - data-hash directory drunken-bishop exceptions filepath haskeline - hourglass iconv mime mtl network network-simple network-uri parsec - pem process regex-compat safe temporary terminal-size text tls - transformers unix x509 x509-store x509-validation + asn1-encoding asn1-types base bytestring containers cryptonite + data-default-class data-hash directory drunken-bishop exceptions + filepath haskeline hourglass iconv memory mime mtl network + network-simple network-uri parsec pem process regex-compat safe + temporary terminal-size text tls transformers unix x509 x509-store + x509-validation ]; description = "Gemini client"; license = lib.licenses.gpl3Only; @@ -80442,8 +80517,8 @@ self: { }: mkDerivation { pname = "dsv"; - version = "1.0.0.1"; - sha256 = "1lf6fan0mis0hs30yfpslfyj0gpk028z24wca3lylq877pq7z6nz"; + version = "1.0.0.2"; + sha256 = "1499qdsxn6qvavgi0g6x75w0cl21dc1f7nn79ajr0lq56dpdx873"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring cassava containers foldl pipes @@ -83342,6 +83417,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "elm-bridge_0_7_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.7.0"; + sha256 = "1ccqsvyy60bzq7vhy9kwbl6rmlnpk0bpy7wyqapm54qxkx71bfk6"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + description = "Derive Elm types and Json code from Haskell types, using aeson's options"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -89597,6 +89689,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "fast-digits_0_3_1_0" = callPackage + ({ mkDerivation, base, integer-gmp, QuickCheck, smallcheck, tasty + , tasty-bench, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "fast-digits"; + version = "0.3.1.0"; + sha256 = "1q6kq5rrd4ivg4s8yhzqsc3gx4n554nz7285mgfqwxgfx8r4mmki"; + libraryHaskellDepends = [ base integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + doHaddock = false; + description = "Integer-to-digits conversion"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fast-downward" = callPackage ({ mkDerivation, base, containers, mtl, process, temporary, text , transformers @@ -102726,8 +102837,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.3.0.0"; - sha256 = "129pcvbyp416gimqva8s368kq64sp17lsyxr2z6j6qbif2xl9pcy"; + version = "0.3.1.0"; + sha256 = "10s9i2n8r3ckdz3kd1s4pwwm4j8p8fg13xhn2m2dy4832iwg12bz"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -105691,6 +105802,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "github-rest_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client + , http-client-tls, http-types, jwt, mtl, scientific, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "github-rest"; + version = "1.1.0"; + sha256 = "0xyvmc8hj3rfglnhg6xcrdsd9gbii8yzh8qw5xjdyccmdsibckx3"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types jwt + mtl scientific text time transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring http-client http-client-tls + http-types jwt mtl scientific tasty tasty-golden tasty-hunit + tasty-quickcheck text time transformers unliftio unliftio-core + ]; + description = "Query the GitHub REST API programmatically"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -130293,7 +130428,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger_1_22_1" = callPackage + "hledger_1_22_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, data-default, Decimal, Diff , directory, extra, filepath, githash, hashable, haskeline @@ -130304,8 +130439,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.22.1"; - sha256 = "0pj0xfjgcfskfm8cfay00jj0amya480846vcv65l2mw191svjb0i"; + version = "1.22.2"; + sha256 = "1g1v56fxgs7ya8yl22brwgrs49a50kd77k8ad8m8l5cnlnviqb3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130562,7 +130697,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_22_1" = callPackage + "hledger-lib_1_22_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default @@ -130574,8 +130709,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.22.1"; - sha256 = "090zrvx1af341p0m1n4bdhgv5h5aq93bxnyk9d9yf5bv25zd1r3b"; + version = "1.22.2"; + sha256 = "0xv8g6xyqjlqqlgq4qc0r1nskj4r53q000q5075hzp7gww8lzidl"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -130671,7 +130806,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger-ui_1_22_1" = callPackage + "hledger-ui_1_22_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries , brick, cmdargs, containers, data-default, directory, extra , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -130680,8 +130815,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.22.1"; - sha256 = "0q0vrsrg0hblycmrbgibyq8264drli6zjp5ppxpw874vkipjcvip"; + version = "1.22.2"; + sha256 = "07mal5ql3yvx0m38kkfh7zyjqn34m5a07jmhm23mwv4a4pdck4rw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130753,7 +130888,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger-web_1_22_1" = callPackage + "hledger-web_1_22_2" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra , containers, data-default, Decimal, directory, extra, filepath @@ -130766,8 +130901,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.22.1"; - sha256 = "02ckw3012icz4hmbw7bdiclwwk2cqwrl3ds1f3w9i52lgwk5ncpd"; + version = "1.22.2"; + sha256 = "1ia11h2r6cl1985lij598qighxfhqfcv4am0nyfpvfihik14fq4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133737,7 +133872,6 @@ self: { executableToolDepends = [ alex happy ]; description = "A language based on homotopy type theory with an interval type"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "hora" = callPackage @@ -137198,14 +137332,14 @@ self: { , hspec-discover, hspec-expectations, hspec-wai, http-api-data , http-media, http-types, hw-hspec-hedgehog, list-t, microlens , mmorph, mtl, network-uri, retry, scientific, servant - , servant-server, stm, stm-containers, string-conversions - , template-haskell, text, time, unordered-containers, uuid, wai - , wai-extra, warp + , servant-client, servant-client-core, servant-server, stm + , stm-containers, string-conversions, template-haskell, text, time + , unordered-containers, uuid, wai, wai-extra, warp }: mkDerivation { pname = "hscim"; - version = "0.3.4"; - sha256 = "0jyb630gsbiw7zy043mqh9i86nj19y0gn0mgs9hvh21h8xfp6xvj"; + version = "0.3.5"; + sha256 = "16qkrw1a5la2x26d3q1bixxlnf1giqcc8bx4gn4swbynkyrsihr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137213,27 +137347,27 @@ self: { email-validate hashable hedgehog hspec hspec-expectations hspec-wai http-api-data http-media http-types hw-hspec-hedgehog list-t microlens mmorph mtl network-uri retry scientific servant - servant-server stm stm-containers string-conversions - template-haskell text time unordered-containers uuid wai wai-extra - warp + servant-client servant-client-core servant-server stm + stm-containers string-conversions template-haskell text time + unordered-containers uuid wai wai-extra warp ]; executableHaskellDepends = [ aeson aeson-qq attoparsec base bytestring case-insensitive email-validate hashable hedgehog hspec hspec-expectations hspec-wai http-api-data http-media http-types hw-hspec-hedgehog list-t microlens mmorph mtl network-uri retry scientific servant - servant-server stm stm-containers string-conversions - template-haskell text time unordered-containers uuid wai wai-extra - warp + servant-client servant-client-core servant-server stm + stm-containers string-conversions template-haskell text time + unordered-containers uuid wai wai-extra warp ]; testHaskellDepends = [ aeson aeson-qq attoparsec base bytestring case-insensitive email-validate hashable hedgehog hspec hspec-expectations hspec-wai http-api-data http-media http-types hw-hspec-hedgehog list-t microlens mmorph mtl network-uri retry scientific servant - servant-server stm stm-containers string-conversions - template-haskell text time unordered-containers uuid wai wai-extra - warp + servant-client servant-client-core servant-server stm + stm-containers string-conversions template-haskell text time + unordered-containers uuid wai wai-extra warp ]; testToolDepends = [ hspec-discover ]; description = "hscim json schema and server implementation"; @@ -138333,7 +138467,6 @@ self: { ]; description = "Nock 5K interpreter"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "hsnoise" = callPackage @@ -143024,7 +143157,6 @@ self: { ]; description = "A simple command line calculator"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "hutton" = callPackage @@ -152851,6 +152983,27 @@ self: { broken = true; }) {}; + "jet-stream" = callPackage + ({ mkDerivation, async, base, bytestring, conceit, doctest, foldl + , process, stm, stm-chans, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "jet-stream"; + version = "1.0.0.0"; + sha256 = "1nbxm1g83wf2wv0hlrrc37rppj80r4hwij47j98n6rwsm94rvigd"; + libraryHaskellDepends = [ + async base bytestring conceit process stm stm-chans text + ]; + testHaskellDepends = [ + async base bytestring conceit doctest foldl process stm stm-chans + tasty tasty-hunit text time + ]; + description = "Yet another streaming library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "jinquantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, quantities, regex-compat @@ -167135,6 +167288,47 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lnurl" = callPackage + ({ mkDerivation, aeson, base, base16, base64, bytestring, cereal + , cryptonite, extra, haskoin-core, http-types, memory, network-uri + , text + }: + mkDerivation { + pname = "lnurl"; + version = "0.1.0.0"; + sha256 = "0rw4z8rg06a1dp0adgnxqgcv75v183apm9lcpc986sx4pns96pjs"; + libraryHaskellDepends = [ + aeson base base16 base64 bytestring cereal cryptonite extra + haskoin-core http-types memory network-uri text + ]; + description = "Support for developing against the LNURL protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "lnurl-authenticator" = callPackage + ({ mkDerivation, aeson, base, bech32, bytestring, Clipboard + , containers, cryptonite, directory, filepath, haskeline + , haskoin-core, http-client, http-client-tls, lnurl, memory + , optparse-applicative, text, time + }: + mkDerivation { + pname = "lnurl-authenticator"; + version = "0.1.0.0"; + sha256 = "0jzw0h4rp9i3cqa60i3y0vxhaplqg07qmf1182h6anhzmi16n43h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bech32 bytestring containers cryptonite directory + filepath haskeline haskoin-core http-client http-client-tls lnurl + memory text time + ]; + executableHaskellDepends = [ base Clipboard optparse-applicative ]; + description = "A command line tool to manage LNURL auth identities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "load-balancing" = callPackage ({ mkDerivation, base, containers, hslogger, PSQueue, stm }: mkDerivation { @@ -168590,8 +168784,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.12.0"; - sha256 = "0cx879gb37gbldzhkmkz9bcdq4zkjisqrc7x1i85wqr5xjcaphvb"; + version = "0.12.1"; + sha256 = "1ba511lxmlmv3dj483q6bgk5bvb16d2js0qldz513j4azqjr5f19"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -176326,7 +176520,6 @@ self: { ]; description = "Miniature FORTH-like interpreter"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "minilens" = callPackage @@ -177178,7 +177371,6 @@ self: { ]; description = "Generate cabal files for a Haskell project"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "ml-w" = callPackage @@ -180238,6 +180430,48 @@ self: { broken = true; }) {}; + "monomer" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , bytestring-to-vector, c2hs, containers, data-default, directory + , exceptions, extra, formatting, GLEW, hspec, http-client, HUnit + , JuicyPixels, lens, mtl, nanovg, OpenGL, process, random, safe + , scientific, sdl2, silently, stm, text, text-show, time + , transformers, unordered-containers, vector, websockets, wreq + , wuss + }: + mkDerivation { + pname = "monomer"; + version = "1.0.0.0"; + sha256 = "136ja518hybhdl336772pyl5gfpvq7bzbm4gka53fmw3f42a1gkw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring bytestring-to-vector containers + data-default exceptions extra formatting http-client JuicyPixels + lens mtl nanovg OpenGL process safe sdl2 stm text text-show time + transformers unordered-containers vector wreq + ]; + librarySystemDepends = [ GLEW ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson async attoparsec base bytestring bytestring-to-vector + containers data-default exceptions extra formatting http-client + JuicyPixels lens mtl nanovg OpenGL process random safe scientific + sdl2 stm text text-show time transformers unordered-containers + vector websockets wreq wuss + ]; + testHaskellDepends = [ + async attoparsec base bytestring bytestring-to-vector containers + data-default directory exceptions extra formatting hspec + http-client HUnit JuicyPixels lens mtl nanovg OpenGL process safe + sdl2 silently stm text text-show time transformers + unordered-containers vector wreq + ]; + description = "A GUI library for writing native Haskell applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {GLEW = null;}; + "monomorphic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180528,8 +180762,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.15.0"; - sha256 = "174wdjcwkfks7cl3hapm342bf7dgvnfhn6ma6fgdvjd7cag5h8z9"; + version = "1.15.1"; + sha256 = "03r6p37b9hw9n0b143d38z07fjv05jnbw76s1fjx92rm2ybbgh3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180561,8 +180795,8 @@ self: { ({ mkDerivation, base-noprelude, lens, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.4.1"; - sha256 = "19d9nxvdr26rmn197rhiwx7nryp6awsmyx6dz1lp9v2f376gs5dh"; + version = "0.4.2"; + sha256 = "0cmrs0hqrbwrmxycqk39csk0y7hswj2r6p1hgzrxyhy536szabby"; libraryHaskellDepends = [ base-noprelude lens universum ]; description = "A custom prelude used in Morley"; license = lib.licenses.mit; @@ -181157,6 +181391,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mpeff" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "mpeff"; + version = "0.1.0.0"; + sha256 = "08i06akvjxgxspkz5lrfzyd7fx0pnajb0ksbm38zf66f7zm8dk54"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "Efficient effect handlers based on evidence-passing semantics"; + license = lib.licenses.mit; + }) {}; + "mpg123-bindings" = callPackage ({ mkDerivation, base, mpg123 }: mkDerivation { @@ -195099,6 +195344,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "ormolu_0_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, mtl, optparse-applicative, path, path-io, syb + , text + }: + mkDerivation { + pname = "ormolu"; + version = "0.2.0.0"; + sha256 = "0zivz7vcl4m1rjay5md6cdqac9cnfwz9c844l20byiz5h49bwfhb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers Diff dlist exceptions + ghc-lib-parser mtl syb text + ]; + executableHaskellDepends = [ + base filepath ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -202687,8 +202960,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.5.2.0"; - sha256 = "05l2nj9rwz0cl3ig8ysi49jjhs7fngfww1rg10klrlg19whwf24j"; + version = "0.6.0.1"; + sha256 = "0rhn5xsqy4b330y17saa78v72dc7lq24y2k5p5r3xfbw621plwba"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -202737,8 +203010,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.6.2.0"; - sha256 = "0h6zmvv8zfsaz29z5hyqjw2zcsrjcdxyl76cz8m0yiklinc5b2wb"; + version = "0.7.0.0"; + sha256 = "13v2wizjrnpwi7x42c9aqgsa5yr2x3blpmyqv9jkqxx7ksx0fbfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202799,8 +203072,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.6.2.0"; - sha256 = "03z076ml2wzi521f9p022khhzdg0ymhs52sapqcq6x5xx0x5plzz"; + version = "0.7.0.0"; + sha256 = "1qy4j61mkrkpa5451bzqg92jcbr77djn1jpvdd008pmvzijhnwqr"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -202838,8 +203111,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.4.2.0"; - sha256 = "09j5j79kclz32g59mbd0djq8hs1r17vy4mcb3n9zvs2ydlsyx2x2"; + version = "0.5.0.0"; + sha256 = "0hxlii3d522ikh6czh720p1x97ixjh3b4s16zr6a2vk3h6pkvqw4"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -202890,8 +203163,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.4.2.0"; - sha256 = "0mq7cdlqk6gz54pz394ns7fq3rz0jdwryy6r8kcfpf1qywb61b4s"; + version = "0.5.0.0"; + sha256 = "1zv3ax3idvlhvaspmsalrrw1816rf3w1sza3yscdv221yn1783g7"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -209284,6 +209557,53 @@ self: { license = lib.licenses.mit; }) {}; + "postgrest_8_0_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async + , auto-update, base, base64-bytestring, bytestring + , case-insensitive, cassava, configurator-pg, containers + , contravariant, contravariant-extras, cookie, directory, either + , fast-logger, gitrev, hasql, hasql-dynamic-statements + , hasql-notifications, hasql-pool, hasql-transaction, heredoc + , hspec, hspec-wai, hspec-wai-json, HTTP, http-types + , insert-ordered-containers, interpolatedstring-perl6, jose, lens + , lens-aeson, monad-control, mtl, network, network-uri + , optparse-applicative, parsec, process, protolude, Ranged-sets + , regex-tdfa, retry, scientific, swagger2, text, time + , transformers-base, unix, unordered-containers, vector, wai + , wai-cors, wai-extra, wai-logger, wai-middleware-static, warp + }: + mkDerivation { + pname = "postgrest"; + version = "8.0.0"; + sha256 = "0ypgfpm8732rg94yiava27w1pyng9fg0zqad5nb94q1z402rfgfi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint auto-update base base64-bytestring bytestring + case-insensitive cassava configurator-pg containers contravariant + contravariant-extras cookie directory either fast-logger gitrev + hasql hasql-dynamic-statements hasql-notifications hasql-pool + hasql-transaction heredoc HTTP http-types insert-ordered-containers + interpolatedstring-perl6 jose lens lens-aeson mtl network + network-uri optparse-applicative parsec protolude Ranged-sets + regex-tdfa retry scientific swagger2 text time unix + unordered-containers vector wai wai-cors wai-extra wai-logger + wai-middleware-static warp + ]; + executableHaskellDepends = [ base containers protolude ]; + testHaskellDepends = [ + aeson aeson-qq async auto-update base base64-bytestring bytestring + case-insensitive cassava containers contravariant hasql + hasql-dynamic-statements hasql-pool hasql-transaction heredoc hspec + hspec-wai hspec-wai-json http-types lens lens-aeson monad-control + process protolude regex-tdfa text time transformers-base wai + wai-extra + ]; + description = "REST API for any Postgres database"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgrest-ws" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base64-bytestring , bytestring, configurator, containers, contravariant, either @@ -216037,7 +216357,6 @@ self: { ]; description = "A package for prompting values from the command-line"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "queue" = callPackage @@ -219794,8 +220113,6 @@ self: { librarySystemDepends = [ ncurses readline ]; description = "An interface to the GNU readline library"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; "readline-statevar" = callPackage @@ -219807,7 +220124,6 @@ self: { libraryHaskellDepends = [ base readline StateVar ]; description = "Readline with variables (setX/getY) wrapped in state vars"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "readme-lhs" = callPackage @@ -224257,6 +224573,32 @@ self: { broken = true; }) {}; + "req-conduit_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , hspec-discover, http-client, req, resourcet, temporary + , transformers, weigh + }: + mkDerivation { + pname = "req-conduit"; + version = "1.0.1"; + sha256 = "0zyy9j6iiz8z2jdx25vp77arfbmrck7bjndm3p4s9l9399c5bm62"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-extra req resourcet temporary weigh + ]; + description = "Conduit helpers for the req HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "req-oauth2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , data-default-class, hspec, http-client, http-types, lens @@ -226197,6 +226539,35 @@ self: { license = lib.licenses.mit; }) {}; + "rio_0_1_21_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, primitive, process, QuickCheck, text, time + , typed-process, unix, unliftio, unliftio-core + , unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.21.0"; + sha256 = "013m4xgsmg8h1rba9krxppz49lc5wz26gksms5zibsjj0w59m58h"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens microlens-mtl mtl primitive process text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens microlens-mtl mtl primitive process + QuickCheck text time typed-process unix unliftio unliftio-core + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A standard library for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rio-app" = callPackage ({ mkDerivation, base, optparse-simple, resourcet, rio }: mkDerivation { @@ -244946,6 +245317,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "snowchecked" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, hedgehog + , time, wide-word + }: + mkDerivation { + pname = "snowchecked"; + version = "0.0.0.3"; + sha256 = "08a4v3i3ky4vbllag7wmmf4qbnf6dan93h7ipcngxk9vhx9wh4vh"; + libraryHaskellDepends = [ + base bytestring data-default deepseq time wide-word + ]; + testHaskellDepends = [ + base bytestring data-default deepseq hedgehog time wide-word + ]; + description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; + license = lib.licenses.asl20; + }) {}; + "snowflake" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -245396,19 +245785,18 @@ self: { "solana-staking-csvs" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs - , hedgehog, mtl, req, scientific, tasty, tasty-hedgehog - , tasty-hunit, text, time + , cointracking-imports, hedgehog, mtl, req, scientific, tasty + , tasty-hedgehog, tasty-hunit, text, time }: mkDerivation { pname = "solana-staking-csvs"; - version = "0.1.0.0"; - sha256 = "1rswlfanbkh6k3f8dnnlrh9wbk8qbi87c61bi30ndw7gndf3gyqj"; - revision = "1"; - editedCabalFile = "0n83h717zi900ph65imqi5z7va00nm492g911m25j0hgnrj0wd06"; + version = "0.1.1.0"; + sha256 = "0ya63vgh0nf4p7hz6fj38m44wr77jj76bf2qxdgra3lpiziqsjd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cassava cmdargs mtl req scientific text time + aeson base bytestring cassava cmdargs cointracking-imports mtl req + scientific text time ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -254852,7 +255240,6 @@ self: { ]; description = "Clojure without alphanumerics"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "sweet-egison" = callPackage @@ -255112,7 +255499,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_2" = callPackage + "sydtest_0_3_0_3" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -255121,8 +255508,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.2"; - sha256 = "1823g9czwgf0p0jyxlddqwnpwhs3622892c9ah6cacvl9xfl3sg9"; + version = "0.3.0.3"; + sha256 = "1h6x9k5shpsp028d5mhi03pgzg324qglapk1nick1cnr0njr7v7w"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -261813,18 +262200,29 @@ self: { broken = true; }) {}; - "text_1_2_4_1" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq, ghc-prim - , integer-gmp, template-haskell + "text_1_2_5_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, bytestring-lexing + , containers, deepseq, directory, filepath, ghc-prim, QuickCheck + , quickcheck-unicode, random, stringsearch, tasty, tasty-bench + , tasty-hunit, tasty-inspection-testing, tasty-quickcheck + , template-haskell, transformers, vector }: mkDerivation { pname = "text"; - version = "1.2.4.1"; - sha256 = "0bnb4g5lpranra58zpwqh14hvwdh6zc4nz3hwppzrpdahi10s7hv"; + version = "1.2.5.0"; + sha256 = "0wwgsq7px8cvmqj3264132xsbj6b92j6mfgd1jlk08vdl8hmx821"; libraryHaskellDepends = [ - array base binary bytestring deepseq ghc-prim integer-gmp + array base binary bytestring deepseq ghc-prim template-haskell + ]; + testHaskellDepends = [ + base bytestring deepseq directory QuickCheck quickcheck-unicode + random tasty tasty-hunit tasty-inspection-testing tasty-quickcheck template-haskell ]; + benchmarkHaskellDepends = [ + base binary bytestring bytestring-lexing containers deepseq + filepath stringsearch tasty-bench transformers vector + ]; doCheck = false; description = "An efficient packed Unicode text type"; license = lib.licenses.bsd2; @@ -267056,8 +267454,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.3.0"; - sha256 = "07ph3jh84wq9373kzw5xv4gzk2wcq9dj5akw5a79lhzphl9py7w0"; + version = "1.0.4.0"; + sha256 = "1hzppwrdqz4l88r33m1gh9kzialjq82m1mhzqzzlsaicy5ps84zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -270613,7 +271011,6 @@ self: { ]; description = "A Haskell-based CLI Twitter client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "twitter-conduit" = callPackage @@ -280813,6 +281210,44 @@ self: { license = lib.licenses.mit; }) {}; + "wai-middleware-auth_0_2_5_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary + , blaze-builder, blaze-html, bytestring, case-insensitive, cereal + , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client + , http-client-tls, http-conduit, http-reverse-proxy, http-types + , jose, microlens, mtl, optparse-applicative, optparse-simple + , regex-posix, safe-exceptions, shakespeare, tasty, tasty-hedgehog + , tasty-hunit, text, time, unix-compat, unordered-containers + , uri-bytestring, vault, wai, wai-app-static, wai-extra, warp, yaml + }: + mkDerivation { + pname = "wai-middleware-auth"; + version = "0.2.5.1"; + sha256 = "0ch9vh14bhnf7g789rbqqgnn3q2nc892xs73kf7k6l8n9p2md0yd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary blaze-builder blaze-html + bytestring case-insensitive cereal clientsession cookie exceptions + hoauth2 http-client http-client-tls http-conduit http-reverse-proxy + http-types jose microlens mtl regex-posix safe-exceptions + shakespeare text time unix-compat unordered-containers + uri-bytestring vault wai wai-app-static wai-extra yaml + ]; + executableHaskellDepends = [ + base bytestring cereal clientsession optparse-applicative + optparse-simple wai-extra warp + ]; + testHaskellDepends = [ + aeson base binary bytestring clientsession cookie hedgehog hoauth2 + http-types jose microlens mtl tasty tasty-hedgehog tasty-hunit text + time uri-bytestring wai wai-extra warp + ]; + description = "Authentication middleware that secures WAI application"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-middleware-brotli" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix @@ -284790,8 +285225,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.11"; - sha256 = "19mcfs9php03g3kb7pgfxcpilvmq5bxbyfkx59mk41nx6f0jfl0d"; + version = "0.0.12"; + sha256 = "118wl1g1p4cqbqil0swr5n0czwd5wi2qqngjwdggrhkspzmqbqd1"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector diff --git a/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch b/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch new file mode 100644 index 000000000000..95853b32a14b --- /dev/null +++ b/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch @@ -0,0 +1,8 @@ +--- a/Setup.hs 2021-02-04 14:01:09.557970245 +0100 ++++ b/Setup.hs 2021-02-04 14:07:45.047443753 +0100 +@@ -3,4 +3,4 @@ + import Distribution.Simple + + main :: IO () +-main = defaultMainWithHooks defaultUserHooks ++main = defaultMainWithHooks autoconfUserHooks diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix deleted file mode 100644 index 29993ed02b8c..000000000000 --- a/pkgs/development/libraries/boost/1.67.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.67.0"; - - patches = [ - (fetchpatch { - url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch"; - sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; - stripLen = 1; - }) - ] ++ lib.optionals stdenv.cc.isClang [ - # Fixes https://github.com/boostorg/atomic/issues/15 - (fetchpatch { - url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; - sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a"; - stripLen = 1; - }) - - # Needed for the next patch - (fetchpatch { - url = "https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch"; - sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n"; - stripLen = 1; - }) - # Fixes https://github.com/boostorg/asio/pull/91 - (fetchpatch { - url = "https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch"; - sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is"; - stripLen = 1; - }) - ]; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_66_0.html - sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; - }; -}) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 1cc19277522d..d78db53ea4b5 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "cmark"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg="; }; + patches = [ + # Fix libcmark.pc paths (should be incorporated next release) + (fetchpatch { + url = "https://github.com/commonmark/cmark/commit/15762d7d391483859c241cdf82b1615c6b6a5a19.patch"; + sha256 = "sha256-wdyK1tQolgfiwYMAaWMQZdCSbMDCijug5ykpoDl/HwI="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ @@ -19,10 +27,12 @@ stdenv.mkDerivation rec { "-DCMARK_STATIC=OFF" ]; - doCheck = !stdenv.isDarwin; + doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$(readlink -f ./src) + preCheck = let + lib_path = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + export ${lib_path}=$(readlink -f ./src) ''; meta = with lib; { diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index e81a61bd40b9..0d1374018b6c 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -5,6 +5,7 @@ , glib , hunspell , hspell +, nuspell , unittest-cpp }: @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib hunspell + nuspell ]; checkInputs = [ diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 943a25dcf646..6c66561f29f2 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -9,13 +9,49 @@ useEncumberedCode ? true }: -let - inherit (lib) optional optionalString; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "freetype"; version = "2.11.0"; + src = fetchurl { + url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec="; + }; + + propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype + + # dependence on harfbuzz is looser than the reverse dependence + nativeBuildInputs = [ pkg-config which makeWrapper ] + # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. + ++ lib.optional (!stdenv.isLinux) gnumake; + + patches = [ + ./enable-table-validation.patch + ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch; + + outputs = [ "out" "dev" ]; + + configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; + + # native compiler to generate building tool + CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; + + # The asm for armel is written with the 'asm' keyword. + CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99"; + + enableParallelBuilding = true; + + doCheck = true; + + postInstall = glib.flattenInclude + '' + substituteInPlace $dev/bin/freetype-config \ + --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} + + wrapProgram "$dev/bin/freetype-config" \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" + ''; + meta = with lib; { description = "A font rendering engine"; longDescription = '' @@ -30,44 +66,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-i+45vTloxIBLcGFKCjrVlyma0OgkvIqtXOiq9IBnvec="; - }; - - propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype - - # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] - # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - ++ optional (!stdenv.isLinux) gnumake; - - patches = - [ ./enable-table-validation.patch - ] ++ - optional useEncumberedCode ./enable-subpixel-rendering.patch; - - outputs = [ "out" "dev" ]; - - configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; - - # native compiler to generate building tool - CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; - - # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; - - enableParallelBuilding = true; - - doCheck = true; - - postInstall = glib.flattenInclude + '' - substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} - - wrapProgram "$dev/bin/freetype-config" \ - --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" - ''; - } diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 726666ec06f3..35a4d9362680 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }: -stdenv.mkDerivation rec { +lib.fix (self: stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; - version = "2"; + version = "8"; src = fetchurl { url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz"; - sha256 = "0zsl4vl65ic6lw5rzcjzvcxg8makg683abnwvy60zfap8hvijvjb"; + sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym"; }; + doCheck = true; + checkInputs = [ python3 ]; + # these tests cover use as a build-time-linked library + checkPhase = '' + make test + ''; + installPhase = '' + install -Dm444 -t $out/include include/* install -Dm444 -t $out/lib libhardened_malloc.so mkdir -p $out/bin @@ -19,28 +27,51 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - doInstallCheck = true; - installCheckPhase = '' - pushd test - make - $out/bin/preload-hardened-malloc ./offset + passthru = { + ld-preload-tests = stdenv.mkDerivation { + name = "${self.name}-ld-preload-tests"; + src = self.src; - pushd simple-memory-corruption - make + nativeBuildInputs = [ makeWrapper ]; - # these tests don't actually appear to generate overflows currently - rm read_after_free_small string_overflow eight_byte_overflow_large + # reuse the projects tests to cover use with LD_PRELOAD. we have + # to convince the test programs to build as though they're naive + # standalone executables. this includes disabling tests for + # malloc_object_size, which doesn't make sense to use via LD_PRELOAD. + buildPhase = '' + pushd test/simple-memory-corruption + make LDLIBS= LDFLAGS=-Wl,--unresolved-symbols=ignore-all CXXFLAGS=-lstdc++ + substituteInPlace test_smc.py \ + --replace 'test_malloc_object_size' 'dont_test_malloc_object_size' \ + --replace 'test_invalid_malloc_object_size' 'dont_test_invalid_malloc_object_size' + popd # test/simple-memory-corruption + ''; - for t in `find . -regex ".*/[a-z_]+"` ; do - echo "Running $t..." - # the program being aborted (as it should be) would result in an exit code > 128 - (($out/bin/preload-hardened-malloc $t) && false) \ - || (test $? -gt 128 || (echo "$t was not aborted" && false)) - done - popd + installPhase = '' + mkdir -p $out/test + cp -r test/simple-memory-corruption $out/test/simple-memory-corruption - popd - ''; + mkdir -p $out/bin + makeWrapper ${python3.interpreter} $out/bin/run-tests \ + --add-flags "-I -m unittest discover --start-directory $out/test/simple-memory-corruption" + ''; + }; + tests = { + ld-preload = runCommand "ld-preload-test-run" {} '' + ${self}/bin/preload-hardened-malloc ${self.ld-preload-tests}/bin/run-tests + touch $out + ''; + # to compensate for the lack of tests of correct normal malloc operation + stress = runCommand "stress-test-run" {} '' + ${self}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ + --no-rand-seed \ + --malloc 8 \ + --malloc-ops 1000000 \ + --verify + touch $out + ''; + }; + }; meta = with lib; { homepage = "https://github.com/GrapheneOS/hardened_malloc"; @@ -54,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ris ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index c3ae6faecfd7..449a7a17623b 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gobject-introspection +{ lib, stdenv, fetchurl, substituteAll, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: @@ -10,15 +10,22 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.5"; + version = "0.3.7"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv"; + sha256 = "sha256-2l8l1oc2ImibM1FIbL4CjvwlRAP2Rt2BIl3+hULYxn0="; }; + patches = [ + (substituteAll { + src = ./fix-python-path.patch; + python = "${pythonEnv}/bin/python3"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 diff --git a/pkgs/development/libraries/gusb/fix-python-path.patch b/pkgs/development/libraries/gusb/fix-python-path.patch new file mode 100644 index 000000000000..5f04387a537e --- /dev/null +++ b/pkgs/development/libraries/gusb/fix-python-path.patch @@ -0,0 +1,14 @@ +diff --git a/gusb/meson.build b/gusb/meson.build +index 8236a2b..282aa48 100644 +--- a/gusb/meson.build ++++ b/gusb/meson.build +@@ -147,7 +147,7 @@ libgusb_gir = libgusb_girtarget[0] + libgusb_typelib = libgusb_girtarget[1] + + pymod = import('python') +-py_installation = pymod.find_installation() ++py_installation = pymod.find_installation('@python@') + + # Verify the map file is correct -- note we can't actually use the generated + # file for two reasons: + diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 6776f5ae3934..7a3a77931c76 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional fixedPoint "--enable-fixed-point" ++ lib.optional withCustomModes "--enable-custom-modes"; - doCheck = !stdenv.isi686; # test_unit_LPC_inv_pred_gain fails + doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index 7279dc9ddfa2..d1a99fb88ab4 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' rm -rf googletest - cp -r ${gtest.src}/googletest googletest + cp -r ${gtest.src} googletest chmod -R a+w googletest ''; diff --git a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch b/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch new file mode 100644 index 000000000000..5ecfb4175569 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch @@ -0,0 +1,12 @@ +diff --git a/Configure b/Configure +index 494e0b3..0b448aa 100755 +--- a/Configure ++++ b/Configure +@@ -652,6 +652,8 @@ my %table=( + "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + # iPhoneOS/iOS + "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d4be8cc2428e..fc2c2fad1959 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -185,6 +185,8 @@ in { (if stdenv.hostPlatform.isDarwin then ./1.0.2/use-etc-ssl-certs-darwin.patch else ./1.0.2/use-etc-ssl-certs.patch) + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + ./1.0.2/darwin64-arm64.patch ]; extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ]; }; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 452f72146d95..44d9c01ded17 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.14"; + version = "1.0.18"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-ZmaxHm4MPd2q83PLduoavoynqRPEI79IpMfW32gkV14="; + sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index bd6eea65f6f3..9fc0c0b2aa0a 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -10,7 +10,28 @@ self = rec { freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; - CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib:${gobject-introspection}/lib"; + CPATH = lib.makeSearchPath "include" + [ libfixposix + ]; + LD_LIBRARY_PATH = lib.makeLibraryPath + [ cairo + freetds + fuse + gdk-pixbuf + glib + gobject-introspection + gtk3 + libev + libfixposix + libmysqlclient + libuv + openssl + openssl_lib_marked + pango + postgresql + sqlite + webkitgtk + ] + + ":${libmysqlclient}/lib/mysql"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6e583615212d..116d9c2af9b5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -238,13 +238,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.7" = { + "@apollo/client-3.4.8" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.7"; + version = "3.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.7.tgz"; - sha512 = "EmqGxXD8hr05cIFWJFwtGXifc+Lo8hTCEuiaQMtKknHszJfqIFXSxqP+H+eJnjfuoxH74aTSsZKtJlnE83Vt6w=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.8.tgz"; + sha512 = "/cNqTSwc2Dw8q6FDDjdd30+yvhP7rI0Fvl3Hbro0lTtFuhzkevfNyQaI2jAiOrjU6Jc0RbanxULaNrX7UmvjSQ=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -1651,13 +1651,13 @@ let sha512 = "3E4/6sCLEcoPUk6FJHOpLGqBNSE2AHrIrErXKRFU3je/MZotxvWrfrZY3IsENJgjJ69Zv0dxMxTZo/l+BVNa3w=="; }; }; - "@chemzqm/neovim-5.3.4" = { + "@chemzqm/neovim-5.3.5" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.4.tgz"; - sha512 = "UVH9xoNSwhzsnEhhcIc4hoDpmyUhGcqBbco5tuISdGV4gEgOKN48c7WhVMmyrsSGogohVCwPHuDugdssUx66tQ=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.5.tgz"; + sha512 = "khqF4y0Z1WLPJR3LPJRgTAAZHQYTxHFXw3Nzr799aRsKXummSX85SS7ZLnVDyDjzd3x4yonYdWk89K2ZpJslnQ=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -2506,13 +2506,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.3" = { + "@google-cloud/pubsub-2.16.4" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.3"; + version = "2.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.3.tgz"; - sha512 = "KkH0IH1PUzgWBquUhWfSG//R/8K3agYRyrqqeNtLjbr2lnehrOVllPtdnroO4q2lxoul3WrK+esPvtVywkb4Ag=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.4.tgz"; + sha512 = "u6P5Hg+GsjoSQ/grmL36r9vz8BfMFVH99x/c+o4ASvAhCMeHSI1AZ0l3DOlLJ2zgjZ01o+B3aONWi9CFhZg3+w=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2605,22 +2605,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.0.0" = { + "@graphql-tools/merge-8.0.1" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.0.tgz"; - sha512 = "Hdhp3qwDeRwPGUVUkmRwTg5KX/bp1MNkplhI6szgQHeDPaC2l9a1iS6LznVP6xQjsyb8oRPqlVPKfiXemodwFw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.1.tgz"; + sha512 = "YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ=="; }; }; - "@graphql-tools/mock-8.2.0" = { + "@graphql-tools/mock-8.2.1" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.2.0.tgz"; - sha512 = "E6rZITUsexmTssAsPSiVFFBePI9L7VZ33+WQBWldJwqduJ9z1WsL+2eJuKPlOIsQ15cbpnHkr2mIv/yrZv99ug=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.2.1.tgz"; + sha512 = "/DyU742thZ3wSR8NxbzeV2K5sxtfPcnRJDuaN+WuHDOE1X1lsFiS49J0TouEnZCfLuAmhSjUMT/2GbD0xu6ggw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2632,13 +2632,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.1.0" = { + "@graphql-tools/schema-8.1.1" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.0.tgz"; - sha512 = "k6M877jFTKjlRU2f2YYjWx+FKXlhuQlCQQ8IdG5API4UL1qk57zYoNnYlT+CJfWxEfcMvEd6AlJ8wvmapzr53A=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.1.tgz"; + sha512 = "u+0kxPtuP+GcKnGNt459Ob7iIpzesIJeJTmPPailaG7ZhB5hkXIizl4uHrzEIAh2Ja1P/VA8sEBYpu1N0n6Mmg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -2677,13 +2677,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.1.0" = { + "@graphql-tools/utils-8.1.1" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.0.tgz"; - sha512 = "V5a7xAxZ6DHzrYYticmsLgWim+vGnC6ztbiOXrO5cGtOOk5NSK657SZXsyVOR7hNvdWiHSW0dlBZb6zkkfOnHA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.1.tgz"; + sha512 = "QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -2722,15 +2722,6 @@ let sha512 = "AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ=="; }; }; - "@grpc/grpc-js-1.3.5" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.5.tgz"; - sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ=="; - }; - }; "@grpc/grpc-js-1.3.6" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2875,6 +2866,15 @@ let sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw=="; }; }; + "@hpcc-js/wasm-1.4.1" = { + name = "_at_hpcc-js_slash_wasm"; + packageName = "@hpcc-js/wasm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.4.1.tgz"; + sha512 = "WYeIuG/B1B1cTcM9D9bC6qDFSZnEcJ9R3SpTW5jh10sTh0hD1h1t/dZudfLwarJD+ce8q4/BP43BplbP3CeNkQ=="; + }; + }; "@humanwhocodes/config-array-0.5.0" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; @@ -3118,15 +3118,6 @@ let sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; - "@jest/types-24.9.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"; - sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw=="; - }; - }; "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -3145,58 +3136,58 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.32" = { + "@joplin/fork-htmlparser2-4.1.33" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.32"; + version = "4.1.33"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.32.tgz"; - sha512 = "WmIsWhMOXULb8ilfJF1AC/pkqPofXQV0siCQgTcouCQVbD/+nlBcmePkfabBJR9WfkeGiteafBlAV/rZExC+CA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.33.tgz"; + sha512 = "Q5GR6mVKS/1JgNTHtS0hc08YexfVZIq9RAj9j33Zm9SXEDstXn0WP4UpULCWLYOen3ffJ2z4uv9a2vLKcvbbIg=="; }; }; - "@joplin/fork-sax-1.2.36" = { + "@joplin/fork-sax-1.2.37" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.36"; + version = "1.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.36.tgz"; - sha512 = "gbhLk1Ic8+fNqU/fKdssUpIvhAhysXcr5CWZy8UMHvryvCB/n8NwR7W1knU5KTZY1omT/OOL21YnRUrpQtQ5mg=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.37.tgz"; + sha512 = "3S71WcFLsZQ4tlZ7LNZRBoEE0LJJL8gxhqwAKZXKYTF5syShZDNWwSpntB4AoFWry3L0I+HnjXm2psQfQzo15Q=="; }; }; - "@joplin/lib-2.2.4" = { + "@joplin/lib-2.3.1" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "2.2.4"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.2.4.tgz"; - sha512 = "RXxN4dp7d6VYN1ERA6xt+DzmAloPwqQycEsWNWZWKwXnn2nfTc3qNIEFbQ1QPn2Rh6Z6WmGmHeh0HnhuYDuraw=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.3.1.tgz"; + sha512 = "/OIyf4AdF/JLFf+ZTYsusrjl5XCDV20wwi0JnvxnySYgG9Y4GgNusDPI0/77+rj+KQA/E91FzGeWoSDc5XOUsA=="; }; }; - "@joplin/renderer-2.2.4" = { + "@joplin/renderer-2.3.1" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "2.2.4"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.2.4.tgz"; - sha512 = "nGycXJ0r0hcJSsqNn/G/9oX/vPdj8rR0UlNCJttUND3wB1qSxTVlDGcWWMye9WwypASiLej1lnF1N/dKCsLvDA=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.3.1.tgz"; + sha512 = "wOxuScEao2f3kIs+A0qroWe6CiWs1LeZqwBz/w869Qi8MW8wvy2aeyirpnb7yEYh9aCevfiQcUMUvYZ9ekMskg=="; }; }; - "@joplin/turndown-4.0.54" = { + "@joplin/turndown-4.0.55" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.54"; + version = "4.0.55"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.54.tgz"; - sha512 = "1jA4/aGHwMAENO0sMVjh+TZu6K0WihFSez2DJYr+t2PpJ9oXFVaYPoJBfZWiFPSnc32cjfySR6ocf/hmNPIm/Q=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.55.tgz"; + sha512 = "9IgtCAQXzCtkXNE+/4q6dWnbt90kvZIefTLFXLxE+w/gLbBDxSmTCfhCCFPzUA1ORp3LkAJZIiE710fRM0O3gg=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.36" = { + "@joplin/turndown-plugin-gfm-1.0.37" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.36"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.36.tgz"; - sha512 = "gjihxMRn5Al49F+7VWgADT1DRFtG+frC0ZySkUofqlSMM/TPBbm2HPR2aj4GE6T7UIAzJ32lXyxIrdxrGFNaKg=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.37.tgz"; + sha512 = "LRiIezmtnJSdczIT3mPuCvUIdFT01lDYTBDdSNGwBheNt7R9tYIj0nh87OnpBGztktIIsOH/66nbB8KQjVtisQ=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -3217,13 +3208,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.32.0" = { + "@jsii/check-node-1.33.0" = { + name = "_at_jsii_slash_check-node"; + packageName = "@jsii/check-node"; + version = "1.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.33.0.tgz"; + sha512 = "Bajxa09dhkuQ8bM1ve6qtm2oFNhW9/+GaKRh4Deewsk/G86ovLXI/rRS6TfCsSw4E0TGPFWzWy0tBeJuEDo7sw=="; + }; + }; + "@jsii/spec-1.33.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.32.0.tgz"; - sha512 = "XjSnqvmBXvFork9w3ehacqaa0JmUVaEYubOzR1l6z67z2FDZ9C4KP7EqMqjnv/S+j+Ou3tWQPfLICnl6aK1iGA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.33.0.tgz"; + sha512 = "JUu4NhmFQiLnzegaj4gJ5xAt7YjB2fUteJppIN/J49TQJd1kWxsFFmYIMJDuUiAUzo0Gx99N4YqgcfKK3kLAbQ=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3964,13 +3964,13 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; - "@mdn/browser-compat-data-3.3.7" = { + "@mdn/browser-compat-data-3.3.14" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "3.3.7"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.7.tgz"; - sha512 = "X42YckpwhdWwWVWR3UpEUB21oIpYoKGMuswZb34yPcsMCySNwLqHnoE972q/UD8VwtpnmO69fsTFiRT2s1gjfA=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz"; + sha512 = "n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA=="; }; }; "@mdx-js/util-2.0.0-next.8" = { @@ -4081,31 +4081,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.2.7" = { + "@netlify/build-18.2.11" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.2.7"; + version = "18.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.7.tgz"; - sha512 = "1KlY84X+aFVnprlPLnNArcYPOXjDN9elHrD6v6A5SahYFOB307ehQJrDcERIde20r1tRvjb8ly67HI1VY9ib9Q=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.11.tgz"; + sha512 = "jZHWv2Mzq9Em2YbYlg+9F1aRbX7e9SgvngKLBFm2QOxwtpIOkKf8MihcFiF27Q+RM6KJR1IJHmf2bUd2Kqzz2w=="; }; }; - "@netlify/cache-utils-2.0.1" = { + "@netlify/cache-utils-2.0.2" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.1.tgz"; - sha512 = "fAw8rMnl14f9TZmKV1g8+/8yVriitfNf4KcdfGPpGLpmQtpnSiynbzhpOLBHsLtViBCJ8O1vy24LK6CJx9JoqA=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.2.tgz"; + sha512 = "JqmFPDvzSv/emIYUjnM5aN630igsvZ/LcODSGEP2dyLxhmL5XirkEljzl4M+XBnVF4Ah0+EKBwo2ofHpdyeTJA=="; }; }; - "@netlify/config-15.3.0" = { + "@netlify/config-15.3.4" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.3.0"; + version = "15.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.0.tgz"; - sha512 = "aOkD/RqXVp6mfM+Wd3PcYTko4JCR4d/VZtyBp9rfPAkLTBvayBZjATpI3uVWuOpVq8NUm4ERpQ0jKW0IBWUwkw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.4.tgz"; + sha512 = "kzS+JN5TqY56aYbk5hGobZq+5AHDUaaHBTJJNp3pSxj0RCoPgvJt9U4JyRRMkkmwhnnWLNzgbAQczlKzjfMKXQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4117,13 +4117,13 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.8.0" = { + "@netlify/framework-info-5.9.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.8.0.tgz"; - sha512 = "gc8K0BT6CSHnYFirLmUWLoKah+AjStWBsGmwa7gbRmeAaRThJhkRcRVE03EhSnrMQkAMO3IIIMklbE8i/9UpEg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.9.0.tgz"; + sha512 = "rrinZyy3pj5rNe2LPPCwsKT7d4jltDe5cK1JACbvxMXAh7hLMo2nDXsLCsejci2fqfFo2k64UtRsC6XDYbrxPw=="; }; }; "@netlify/functions-utils-2.0.2" = { @@ -4504,13 +4504,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.5" = { + "@npmcli/run-script-1.8.6" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz"; - sha512 = "NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz"; + sha512 = "e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g=="; }; }; "@oclif/color-0.1.2" = { @@ -4540,13 +4540,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.29" = { + "@oclif/core-0.5.30" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.29"; + version = "0.5.30"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.29.tgz"; - sha512 = "v5MMxeTgEKbVcEl7D3jsTVL8Wy3lLTDj0KHX7cOmI751yfjdAOqy9frHQ6IXssxubDkBW6sXzbYN9Bw12zsBqg=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.30.tgz"; + sha512 = "J655ku+fptWPukM15F4DzGZnD1Q1UAzsS7jUy/nHIVhuwjwhl7u9QHLTjZ+1ud/99N2iXaYsa70UcnC1G3mfHQ=="; }; }; "@oclif/errors-1.3.5" = { @@ -4711,13 +4711,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.7.0" = { + "@octokit/plugin-rest-endpoint-methods-5.8.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.7.0.tgz"; - sha512 = "G7sgccWRYQMwcHJXkDY/sDxbXeKiZkFQqUtzBCwmrzCNj2GQf3VygQ4T/BFL2crLVpIbenkE/c0ErhYOte2MPw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz"; + sha512 = "qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A=="; }; }; "@octokit/request-5.6.1" = { @@ -4738,13 +4738,13 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.9.0" = { + "@octokit/rest-18.9.1" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.9.0"; + version = "18.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.0.tgz"; - sha512 = "VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.1.tgz"; + sha512 = "idZ3e5PqXVWOhtZYUa546IDHTHjkGZbj3tcJsN0uhCy984KD865e8GB2WbYDc2ZxFuJRiyd0AftpL2uPNhF+UA=="; }; }; "@octokit/types-6.25.0" = { @@ -5404,15 +5404,6 @@ let sha512 = "9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw=="; }; }; - "@rollup/plugin-commonjs-17.1.0" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "17.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz"; - sha512 = "PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew=="; - }; - }; "@rollup/plugin-commonjs-18.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -5449,15 +5440,6 @@ let sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; }; }; - "@rollup/plugin-node-resolve-13.0.4" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "13.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz"; - sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w=="; - }; - }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -5611,13 +5593,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.6.0" = { + "@serverless/utils-5.7.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.6.0.tgz"; - sha512 = "R3mb6DlPwrlo49fwQNz3YTQb2XJCxVui+s/olVBSdAh82fi8EbbjgkZkaLKB9ES7lV2MIr3jqrIWjYyGE/2Bgw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.7.0.tgz"; + sha512 = "4/9lTag4NNMtgoK7qRSoP//VplnKUTqgKMJ5pjvuXHFTBNoGYbdi5Cr1UmbHwnG8FfYBUy95jNUHjSEeUXDqgg=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -5782,13 +5764,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.10.1" = { + "@snyk/cloud-config-parser-1.10.2" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.1.tgz"; - sha512 = "boqO3H4zkGo+Q2C7qyG2l/sQX80ZRSOlPCiRtgN9Xa7u9fM+qFGOaFOgNWfZZtU0wLBy2yDs5ipzdfqvp0ZEjg=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.2.tgz"; + sha512 = "ovA6iX59jLOVMfZr6rsqYNcOIjZTYAbm34bn41m3hRbCPuZkxe3JNKxjsEFCFkZQBnGSebrbz8TGoe81y0L2Cw=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -7141,13 +7123,13 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mime-types-2.1.0" = { + "@types/mime-types-2.1.1" = { name = "_at_types_slash_mime-types"; packageName = "@types/mime-types"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz"; - sha1 = "9ca52cda363f699c69466c2a6ccdaad913ea7a73"; + url = "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz"; + sha512 = "vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw=="; }; }; "@types/minimatch-3.0.5" = { @@ -7312,15 +7294,6 @@ let sha512 = "7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="; }; }; - "@types/node-16.3.2" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz"; - sha512 = "jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="; - }; - }; "@types/node-16.3.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7330,13 +7303,13 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.3" = { + "@types/node-16.6.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.3"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz"; - sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.6.0.tgz"; + sha512 = "OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ=="; }; }; "@types/node-16.6.1" = { @@ -7483,13 +7456,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.1.0" = { + "@types/rc-1.2.0" = { name = "_at_types_slash_rc"; packageName = "@types/rc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.1.0.tgz"; - sha512 = "qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA=="; + url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.0.tgz"; + sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; "@types/react-16.14.13" = { @@ -7861,15 +7834,6 @@ let sha512 = "8mbDgtc8xpxDDem5Gwj76stBDJX35KQ3YBoayxlqUQcL5BZUthiqP/VQ4PQnLHqM4PmlbyO74t98eJpURO+gPA=="; }; }; - "@types/ws-7.4.6" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "7.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.6.tgz"; - sha512 = "ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw=="; - }; - }; "@types/ws-7.4.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7879,15 +7843,6 @@ let sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; }; }; - "@types/yargs-13.0.12" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "13.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz"; - sha512 = "qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ=="; - }; - }; "@types/yargs-15.0.14" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -7942,13 +7897,13 @@ let sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; }; }; - "@typescript-eslint/eslint-plugin-4.29.1" = { + "@typescript-eslint/eslint-plugin-4.29.2" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz"; - sha512 = "AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz"; + sha512 = "x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7960,13 +7915,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.29.1" = { + "@typescript-eslint/experimental-utils-4.29.2" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz"; - sha512 = "kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz"; + sha512 = "P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7978,22 +7933,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.29.1" = { + "@typescript-eslint/parser-4.29.2" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz"; - sha512 = "3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz"; + sha512 = "WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g=="; }; }; - "@typescript-eslint/scope-manager-4.29.1" = { + "@typescript-eslint/scope-manager-4.29.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz"; - sha512 = "Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz"; + sha512 = "mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -8005,13 +7960,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.29.1" = { + "@typescript-eslint/types-4.29.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz"; - sha512 = "Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz"; + sha512 = "K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -8023,13 +7978,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.29.1" = { + "@typescript-eslint/typescript-estree-4.29.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz"; - sha512 = "lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz"; + sha512 = "TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -8041,13 +7996,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.29.1" = { + "@typescript-eslint/visitor-keys-4.29.2" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz"; - sha512 = "zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz"; + sha512 = "bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8230,31 +8185,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.2" = { + "@vue/compiler-core-3.2.3" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.2.tgz"; - sha512 = "QhCI0ZU5nAR0LMcLgzW3v75374tIrHGp8XG5CzJS7Nsy+iuignbE4MZ2XJfh5TGIrtpuzfWA4eTIfukZf/cRdg=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.3.tgz"; + sha512 = "qQpACs40hClYqghS209OBh6NDArKPrS5emWMOH/hzDy0KtOV7Kfyy2ILWRfamIsygq8mg+xHcqtVXOjr21WvQw=="; }; }; - "@vue/compiler-dom-3.2.2" = { + "@vue/compiler-dom-3.2.3" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz"; - sha512 = "ggcc+NV/ENIE0Uc3TxVE/sKrhYVpLepMAAmEiQ047332mbKOvUkowz4TTFZ+YkgOIuBOPP0XpCxmCMg7p874mA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.3.tgz"; + sha512 = "hEKd+h9eIT+et/l0Nmiup5CWFHC4KuhUcrdAIPLcv1uskVQA3gSDAAx9UGB/G9cRB2gmBpFONHEi8zKrlnsaWQ=="; }; }; - "@vue/shared-3.2.2" = { + "@vue/shared-3.2.3" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.2.tgz"; - sha512 = "dvYb318tk9uOzHtSaT3WII/HscQSIRzoCZ5GyxEb3JlkEXASpAUAQwKnvSe2CudnF8XHFRTB7VITWSnWNLZUtA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.3.tgz"; + sha512 = "1f8kyoabSgoga0E89itGIoaCo2Ayr6i6jQq/kHhhYrrBxoK7LNNwuWQghW0k/bapimyIzQiN891XzquYP78aqg=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8770,13 +8725,13 @@ let sha512 = "ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w=="; }; }; - "@webpack-cli/serve-1.5.1" = { + "@webpack-cli/serve-1.5.2" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz"; - sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha512 = "vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw=="; }; }; "@wry/context-0.6.1" = { @@ -9310,22 +9265,22 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-3.8.0" = { + "addons-linter-3.12.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "3.8.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.8.0.tgz"; - sha512 = "k2s7PS7Oiq9NZnpf1SjG6hyefMC082a91BhSw30QEUgvDT54E2d6j8wfbar1WEigc9uYZgGv3VfzEeqTgoLUpw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.12.0.tgz"; + sha512 = "GAvHjjqxVn8cQYBD6xshneACdaY2KjakWIyUhXrVbx3g8TZSF78ISucKZ1+XtKZLDvEr1LIJjeeYlR49LNH3CQ=="; }; }; - "addons-scanner-utils-4.8.0" = { + "addons-scanner-utils-4.9.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.8.0.tgz"; - sha512 = "LjwZql59OKrQgppreOvRcgJDYrnj9XKVW2gb5Q1ZyGG3CH46VCiiNHJB6nYMgOntLo+DPQwQQPOSknZ1zW+wTw=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.9.0.tgz"; + sha512 = "RF+pVMSj3CcWV6NH4pBboCZnpzfr48ZmJCBXt/LZbU59PNepZDFxax9tl2MXzX01AXNwKUGa321pPyc5h4zV5A=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -9562,6 +9517,15 @@ let sha512 = "USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q=="; }; }; + "ajv-formats-2.1.1" = { + name = "ajv-formats"; + packageName = "ajv-formats"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"; + sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -11425,13 +11389,13 @@ let sha512 = "vRfQwcqBnJTLzVQo72Sf7KIUbcSUP5hNchx6udI1U6LuPQpfePgdjJzlCe76yFZ8pxlLjn9lwcl/Ya0TSOv0Tw=="; }; }; - "async-retry-1.3.1" = { + "async-retry-1.3.3" = { name = "async-retry"; packageName = "async-retry"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz"; - sha512 = "aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA=="; + url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz"; + sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; }; }; "async-retry-ng-2.0.1" = { @@ -11668,13 +11632,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.968.0" = { + "aws-sdk-2.969.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.968.0"; + version = "2.969.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.968.0.tgz"; - sha512 = "6kXJ/4asP+zI8oFJAUqEmVoaLOnAYriorigKy8ZjFe3ISl4w0PEOXBG1TtQFuLiNPR3BAvhRuOQ5yH6JfqDNNw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.969.0.tgz"; + sha512 = "bDQenWDH9CdPIsgh7E6zgq2bO576teSnlQv1Oz0IwxVq+AbGsArSJXjNrvniV1l9TrqPOZk9dqBa/q4mOzwyLw=="; }; }; "aws-sign2-0.6.0" = { @@ -16745,13 +16709,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.32.0" = { + "codemaker-1.33.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.32.0.tgz"; - sha512 = "RYHzKPI83NJi0u7KjUVeAm4rmMwIPjLsFjcSv8sIZizNiVFwWNxON99YhtFvbg0YMbdMnjpkx0W/VADNuwETGA=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.33.0.tgz"; + sha512 = "u9PYqE1HaKINgMDpV7HyYVbtPDbHJNSPn1rTsYSsUkmi1DH1/3tK5nBJ7eUGNbkMP+k2hz7SQGTVcWEMRNAZ0w=="; }; }; "codepage-1.4.0" = { @@ -17339,13 +17303,13 @@ let sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; }; }; - "commonmark-0.29.3" = { + "commonmark-0.30.0" = { name = "commonmark"; packageName = "commonmark"; - version = "0.29.3"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/commonmark/-/commonmark-0.29.3.tgz"; - sha512 = "fvt/NdOFKaL2gyhltSy6BC4LxbbxbnPxBMl923ittqO/JBM0wQHaoYZliE4tp26cRxX/ZZtRsJlZzQrVdUkXAA=="; + url = "https://registry.npmjs.org/commonmark/-/commonmark-0.30.0.tgz"; + sha512 = "j1yoUo4gxPND1JWV9xj5ELih0yMv1iCWDG6eEQIPLSWLxzCXiFoyS7kvB+WwU+tZMf4snwJMMtaubV0laFpiBA=="; }; }; "compact2string-1.4.1" = { @@ -17798,13 +17762,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.121" = { + "constructs-3.3.125" = { name = "constructs"; packageName = "constructs"; - version = "3.3.121"; + version = "3.3.125"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.121.tgz"; - sha512 = "vYTkqiaoGWecZ5yyBkeuPkJd6HsQbABuewGMMUTHI7FcvQk9A52j5KZMfIQ0O5TS2ssPUt4WytuIOdTEW+vIRQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.125.tgz"; + sha512 = "uO6Cm4tINBpnqky9OAGi1fMAESW2adKlwvaTebAtCdmY3COaeGgu1AMwiaLg4INROZE+yONdI4W6xfuq7uDoHQ=="; }; }; "consume-http-header-1.0.0" = { @@ -17880,13 +17844,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.31.0" = { + "contentful-management-7.32.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.31.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.31.0.tgz"; - sha512 = "YhPikvkO/ckRTO400I+iHYpVLuHwPyMzTQcMwBWpUluXYCF45I/RpWw7cyNQciQ19Q0NpjgEfUTQnhFhIqHtwA=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.32.0.tgz"; + sha512 = "L3W3XuSwRzW5X0iVj4rwW8IGSc8+yr+VIzSmTzu5aJv0qVGpYyIAq741nhZj8WhnkJJJu1JisZaRNbj6mGe1wQ=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -18303,40 +18267,40 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.12.0" = { + "core-js-3.16.0" = { name = "core-js"; packageName = "core-js"; - version = "3.12.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.12.0.tgz"; - sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz"; + sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; }; }; - "core-js-3.16.1" = { + "core-js-3.16.2" = { name = "core-js"; packageName = "core-js"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.16.1.tgz"; - sha512 = "AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz"; + sha512 = "P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ=="; }; }; - "core-js-compat-3.16.1" = { + "core-js-compat-3.16.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz"; - sha512 = "NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.2.tgz"; + sha512 = "4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ=="; }; }; - "core-js-pure-3.16.1" = { + "core-js-pure-3.16.2" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.1.tgz"; - sha512 = "TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz"; + sha512 = "oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw=="; }; }; "core-util-is-1.0.2" = { @@ -18447,15 +18411,6 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-6.2.0" = { - name = "cp-file"; - packageName = "cp-file"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; - sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; - }; - }; "cp-file-7.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -19401,6 +19356,15 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; + "d3-7.0.1" = { + name = "d3"; + packageName = "d3"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3/-/d3-7.0.1.tgz"; + sha512 = "74zonD4nAtxF9dtwFwJ3RuoHPh2D/UTFX26midBuMVH+7pRbOezuyLUIb8mbQMuYFlcUXT+xy++orCmnvMM/CA=="; + }; + }; "d3-array-1.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -19419,6 +19383,15 @@ let sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; }; + "d3-array-3.0.2" = { + name = "d3-array"; + packageName = "d3-array"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.2.tgz"; + sha512 = "nTN4OC6ufZueotlexbxBd2z8xmG1eIfhvP2m1auH2ONps0L+AZn1r0JWuzMXZ6XgOj1VBOp7GGZmEs9NUFEBbA=="; + }; + }; "d3-axis-1.0.12" = { name = "d3-axis"; packageName = "d3-axis"; @@ -19428,6 +19401,15 @@ let sha512 = "ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="; }; }; + "d3-axis-3.0.0" = { + name = "d3-axis"; + packageName = "d3-axis"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz"; + sha512 = "IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="; + }; + }; "d3-brush-1.1.6" = { name = "d3-brush"; packageName = "d3-brush"; @@ -19437,6 +19419,15 @@ let sha512 = "7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA=="; }; }; + "d3-brush-3.0.0" = { + name = "d3-brush"; + packageName = "d3-brush"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz"; + sha512 = "ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ=="; + }; + }; "d3-chord-1.0.6" = { name = "d3-chord"; packageName = "d3-chord"; @@ -19446,6 +19437,15 @@ let sha512 = "JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA=="; }; }; + "d3-chord-3.0.1" = { + name = "d3-chord"; + packageName = "d3-chord"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz"; + sha512 = "VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g=="; + }; + }; "d3-collection-1.0.7" = { name = "d3-collection"; packageName = "d3-collection"; @@ -19473,6 +19473,15 @@ let sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; }; }; + "d3-color-3.0.1" = { + name = "d3-color"; + packageName = "d3-color"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-color/-/d3-color-3.0.1.tgz"; + sha512 = "6/SlHkDOBLyQSJ1j1Ghs82OIUXpKWlR0hCsw0XrLSQhuUPuCSmLQ1QPH98vpnQxMUQM2/gfAkUEWsupVpd9JGw=="; + }; + }; "d3-contour-1.3.2" = { name = "d3-contour"; packageName = "d3-contour"; @@ -19482,6 +19491,15 @@ let sha512 = "hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg=="; }; }; + "d3-contour-3.0.1" = { + name = "d3-contour"; + packageName = "d3-contour"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz"; + sha512 = "0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ=="; + }; + }; "d3-delaunay-5.3.0" = { name = "d3-delaunay"; packageName = "d3-delaunay"; @@ -19491,6 +19509,15 @@ let sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w=="; }; }; + "d3-delaunay-6.0.2" = { + name = "d3-delaunay"; + packageName = "d3-delaunay"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz"; + sha512 = "IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ=="; + }; + }; "d3-dispatch-1.0.6" = { name = "d3-dispatch"; packageName = "d3-dispatch"; @@ -19509,6 +19536,15 @@ let sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="; }; }; + "d3-dispatch-3.0.1" = { + name = "d3-dispatch"; + packageName = "d3-dispatch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz"; + sha512 = "rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="; + }; + }; "d3-drag-1.2.5" = { name = "d3-drag"; packageName = "d3-drag"; @@ -19518,6 +19554,24 @@ let sha512 = "rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w=="; }; }; + "d3-drag-2.0.0" = { + name = "d3-drag"; + packageName = "d3-drag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz"; + sha512 = "g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w=="; + }; + }; + "d3-drag-3.0.0" = { + name = "d3-drag"; + packageName = "d3-drag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz"; + sha512 = "pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg=="; + }; + }; "d3-dsv-1.2.0" = { name = "d3-dsv"; packageName = "d3-dsv"; @@ -19536,6 +19590,15 @@ let sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w=="; }; }; + "d3-dsv-3.0.1" = { + name = "d3-dsv"; + packageName = "d3-dsv"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz"; + sha512 = "UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q=="; + }; + }; "d3-ease-1.0.7" = { name = "d3-ease"; packageName = "d3-ease"; @@ -19545,6 +19608,24 @@ let sha512 = "lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="; }; }; + "d3-ease-2.0.0" = { + name = "d3-ease"; + packageName = "d3-ease"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz"; + sha512 = "68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ=="; + }; + }; + "d3-ease-3.0.1" = { + name = "d3-ease"; + packageName = "d3-ease"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz"; + sha512 = "wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="; + }; + }; "d3-fetch-1.2.0" = { name = "d3-fetch"; packageName = "d3-fetch"; @@ -19554,6 +19635,15 @@ let sha512 = "yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA=="; }; }; + "d3-fetch-3.0.1" = { + name = "d3-fetch"; + packageName = "d3-fetch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz"; + sha512 = "kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw=="; + }; + }; "d3-force-1.2.1" = { name = "d3-force"; packageName = "d3-force"; @@ -19572,6 +19662,15 @@ let sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew=="; }; }; + "d3-force-3.0.0" = { + name = "d3-force"; + packageName = "d3-force"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz"; + sha512 = "zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg=="; + }; + }; "d3-format-1.4.5" = { name = "d3-format"; packageName = "d3-format"; @@ -19590,6 +19689,15 @@ let sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; }; }; + "d3-format-3.0.1" = { + name = "d3-format"; + packageName = "d3-format"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-format/-/d3-format-3.0.1.tgz"; + sha512 = "hdL7+HBIohpgfolhBxr1KX47VMD6+vVD/oEFrxk5yhmzV2prk99EkFKYpXuhVkFpTgHdJ6/4bYcjdLPPXV4tIA=="; + }; + }; "d3-geo-1.12.1" = { name = "d3-geo"; packageName = "d3-geo"; @@ -19608,6 +19716,15 @@ let sha512 = "8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA=="; }; }; + "d3-geo-3.0.1" = { + name = "d3-geo"; + packageName = "d3-geo"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz"; + sha512 = "Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA=="; + }; + }; "d3-geo-projection-3.0.0" = { name = "d3-geo-projection"; packageName = "d3-geo-projection"; @@ -19617,6 +19734,15 @@ let sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; }; }; + "d3-graphviz-4.0.0" = { + name = "d3-graphviz"; + packageName = "d3-graphviz"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.0.0.tgz"; + sha512 = "j+fRjPiLnMa3C2QLIWld13vJQzkd9uBhYXZJQSgKI7z2uTvCdMcrvvxJYg7vGdzqceMImKq5Is/oX8kDw+1xng=="; + }; + }; "d3-hierarchy-1.1.9" = { name = "d3-hierarchy"; packageName = "d3-hierarchy"; @@ -19635,6 +19761,15 @@ let sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw=="; }; }; + "d3-hierarchy-3.0.1" = { + name = "d3-hierarchy"; + packageName = "d3-hierarchy"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.0.1.tgz"; + sha512 = "RlLTaofEoOrMK1JoXYIGhKTkJFI/6rFrYPgxy6QlZo2BcVc4HGTqEU0rPpzuMq5T/5XcMtAzv1XiLA3zRTfygw=="; + }; + }; "d3-interpolate-1.4.0" = { name = "d3-interpolate"; packageName = "d3-interpolate"; @@ -19653,6 +19788,15 @@ let sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; }; }; + "d3-interpolate-3.0.1" = { + name = "d3-interpolate"; + packageName = "d3-interpolate"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz"; + sha512 = "3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g=="; + }; + }; "d3-path-1.0.9" = { name = "d3-path"; packageName = "d3-path"; @@ -19671,6 +19815,15 @@ let sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; }; }; + "d3-path-3.0.1" = { + name = "d3-path"; + packageName = "d3-path"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz"; + sha512 = "gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w=="; + }; + }; "d3-polygon-1.0.6" = { name = "d3-polygon"; packageName = "d3-polygon"; @@ -19680,6 +19833,15 @@ let sha512 = "k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="; }; }; + "d3-polygon-3.0.1" = { + name = "d3-polygon"; + packageName = "d3-polygon"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz"; + sha512 = "3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="; + }; + }; "d3-quadtree-1.0.7" = { name = "d3-quadtree"; packageName = "d3-quadtree"; @@ -19698,6 +19860,15 @@ let sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; }; }; + "d3-quadtree-3.0.1" = { + name = "d3-quadtree"; + packageName = "d3-quadtree"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz"; + sha512 = "04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="; + }; + }; "d3-random-1.1.2" = { name = "d3-random"; packageName = "d3-random"; @@ -19707,6 +19878,15 @@ let sha512 = "6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="; }; }; + "d3-random-3.0.1" = { + name = "d3-random"; + packageName = "d3-random"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz"; + sha512 = "FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="; + }; + }; "d3-scale-2.2.2" = { name = "d3-scale"; packageName = "d3-scale"; @@ -19725,6 +19905,15 @@ let sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ=="; }; }; + "d3-scale-4.0.0" = { + name = "d3-scale"; + packageName = "d3-scale"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.0.tgz"; + sha512 = "foHQYKpWQcyndH1CGoHdUC4PECxTxonzwwBXGT8qu+Drb1FIc6ON6dG2P5f4hRRMkLiIKeWK7iFtdznDUrnuPQ=="; + }; + }; "d3-scale-chromatic-1.5.0" = { name = "d3-scale-chromatic"; packageName = "d3-scale-chromatic"; @@ -19734,6 +19923,15 @@ let sha512 = "ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg=="; }; }; + "d3-scale-chromatic-3.0.0" = { + name = "d3-scale-chromatic"; + packageName = "d3-scale-chromatic"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz"; + sha512 = "Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g=="; + }; + }; "d3-selection-1.4.2" = { name = "d3-selection"; packageName = "d3-selection"; @@ -19743,6 +19941,24 @@ let sha512 = "SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="; }; }; + "d3-selection-2.0.0" = { + name = "d3-selection"; + packageName = "d3-selection"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz"; + sha512 = "XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA=="; + }; + }; + "d3-selection-3.0.0" = { + name = "d3-selection"; + packageName = "d3-selection"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz"; + sha512 = "fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="; + }; + }; "d3-shape-1.3.7" = { name = "d3-shape"; packageName = "d3-shape"; @@ -19761,6 +19977,15 @@ let sha512 = "PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA=="; }; }; + "d3-shape-3.0.1" = { + name = "d3-shape"; + packageName = "d3-shape"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.0.1.tgz"; + sha512 = "HNZNEQoDhuCrDWEc/BMbF/hKtzMZVoe64TvisFLDp2Iyj0UShB/E6/lBsLlJTfBMbYgftHj90cXJ0SEitlE6Xw=="; + }; + }; "d3-time-1.1.0" = { name = "d3-time"; packageName = "d3-time"; @@ -19779,6 +20004,15 @@ let sha512 = "/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ=="; }; }; + "d3-time-3.0.0" = { + name = "d3-time"; + packageName = "d3-time"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz"; + sha512 = "zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ=="; + }; + }; "d3-time-format-2.3.0" = { name = "d3-time-format"; packageName = "d3-time-format"; @@ -19797,6 +20031,15 @@ let sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; }; }; + "d3-time-format-4.0.0" = { + name = "d3-time-format"; + packageName = "d3-time-format"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.0.0.tgz"; + sha512 = "nzaCwlj+ZVBIlFuVOT1RmU+6xb/7D5IcnhHzHQcBgS/aTa5K9fWZNN5LCXA27LgF5WxoSNJqKBbLcGMtM6Ca6A=="; + }; + }; "d3-timer-1.0.10" = { name = "d3-timer"; packageName = "d3-timer"; @@ -19815,6 +20058,15 @@ let sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="; }; }; + "d3-timer-3.0.1" = { + name = "d3-timer"; + packageName = "d3-timer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz"; + sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="; + }; + }; "d3-transition-1.3.2" = { name = "d3-transition"; packageName = "d3-transition"; @@ -19824,6 +20076,24 @@ let sha512 = "sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA=="; }; }; + "d3-transition-2.0.0" = { + name = "d3-transition"; + packageName = "d3-transition"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz"; + sha512 = "42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog=="; + }; + }; + "d3-transition-3.0.1" = { + name = "d3-transition"; + packageName = "d3-transition"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz"; + sha512 = "ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w=="; + }; + }; "d3-voronoi-1.1.4" = { name = "d3-voronoi"; packageName = "d3-voronoi"; @@ -19842,6 +20112,24 @@ let sha512 = "VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ=="; }; }; + "d3-zoom-2.0.0" = { + name = "d3-zoom"; + packageName = "d3-zoom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz"; + sha512 = "fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw=="; + }; + }; + "d3-zoom-3.0.0" = { + name = "d3-zoom"; + packageName = "d3-zoom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz"; + sha512 = "b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw=="; + }; + }; "dag-map-1.0.2" = { name = "dag-map"; packageName = "dag-map"; @@ -20913,6 +21201,15 @@ let sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; }; }; + "delaunator-5.0.0" = { + name = "delaunator"; + packageName = "delaunator"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz"; + sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw=="; + }; + }; "delay-4.4.1" = { name = "delay"; packageName = "delay"; @@ -22524,13 +22821,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.1.9" = { + "electron-13.2.0" = { name = "electron"; packageName = "electron"; - version = "13.1.9"; + version = "13.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.1.9.tgz"; - sha512 = "By4Zb72XNQLrPb70BXdIW3NtEHFwybP5DIQjohnCxOYONq5vojuHjNcTuWnBgMvwQ2qwykk6Tw5EwF2Pt0CWjA=="; + url = "https://registry.npmjs.org/electron/-/electron-13.2.0.tgz"; + sha512 = "ZnRm1WWhHIKyoNAKVz7nPOHG42v5dhe0uqFsGW5x/KLK8kikHEXIduRnC4Y2XanckHeUFI9tZddWVSIBgqGBGg=="; }; }; "electron-notarize-1.1.0" = { @@ -22569,13 +22866,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.805" = { + "electron-to-chromium-1.3.808" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.805"; + version = "1.3.808"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.805.tgz"; - sha512 = "uUJF59M6pNSRHQaXwdkaNB4BhSQ9lldRdG1qCjlrAFkynPGDc5wPoUcYEQQeQGmKyAWJPvGkYAWmtVrxWmDAkg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.808.tgz"; + sha512 = "espnsbWTuUw0a2jMwfabCc09py2ujB+FZZE1hZWn5yYijEmxzEhdhTLKUfZGjynHvdIMQ4X/Pr/t8s4eiyH/QQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23417,6 +23714,15 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; + "es6-promisify-7.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-7.0.0.tgz"; + sha512 = "ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -23624,15 +23930,6 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; - "eslint-7.28.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; - sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; - }; - }; "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; @@ -23741,6 +24038,15 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; + "eslint-visitor-keys-3.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; + sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; + }; + }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -23795,6 +24101,15 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; + "espree-8.0.0" = { + name = "espree"; + packageName = "espree"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-8.0.0.tgz"; + sha512 = "y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -25019,15 +25334,6 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; - "fast-equals-1.6.3" = { - name = "fast-equals"; - packageName = "fast-equals"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-equals/-/fast-equals-1.6.3.tgz"; - sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; - }; - }; "fast-equals-2.0.3" = { name = "fast-equals"; packageName = "fast-equals"; @@ -25181,15 +25487,6 @@ let sha512 = "lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag=="; }; }; - "fast-stringify-1.1.2" = { - name = "fast-stringify"; - packageName = "fast-stringify"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.2.tgz"; - sha512 = "SfslXjiH8km0WnRiuPfpUKwlZjW5I878qsOm+2x8x3TgqmElOOLh1rgJFb+PolNdNRK3r8urEefqx0wt7vx1dA=="; - }; - }; "fast-text-encoding-1.0.3" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; @@ -28188,13 +28485,13 @@ let sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; - "globby-12.0.0" = { + "globby-12.0.1" = { name = "globby"; packageName = "globby"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.0.tgz"; - sha512 = "3mOIUduqSMHm6gNjIw9E641TZ93NB8lFVt+6MKIw6vUaIS5aSsw/6cl0gT86z1IoKlaL90BiOQlA593GUMlzEA=="; + url = "https://registry.npmjs.org/globby/-/globby-12.0.1.tgz"; + sha512 = "AofdCGi+crQ1uN9+nMbTnvC4XGNPJN9hRiPf+A76lUZIZoWoj4Z9iyUQGge7xCGKgR/7ejB36qoIlLoDBc7fYw=="; }; }; "globby-4.1.0" = { @@ -28332,13 +28629,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.24.0" = { + "google-gax-2.24.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.24.0"; + version = "2.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.0.tgz"; - sha512 = "PtE/Zk3jPrUIAL9YsIq5e+04U3aqEg6/0DmtR/tXKhbcS7SRA1sbPZja+vevuUavIdCXEiBbaKkrBqcQvSxXmw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.1.tgz"; + sha512 = "/oBk3S2jKZO5e85Dnqe0Zo3iAkQuMhy3BfczU6LoLxsoY99E/8EmOPiT7gHxb5KWZzghjo5HyITExLiuIjJ+0A=="; }; }; "google-p12-pem-3.1.2" = { @@ -29583,6 +29880,15 @@ let sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; + "highlight.js-11.2.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.2.0.tgz"; + sha512 = "JOySjtOEcyG8s4MLR2MNbLUyaXqUunmSnL2kdV/KuGJOmHZuAR5xC54Ko7goAXBWNhf09Vy3B+U7vR62UZ/0iw=="; + }; + }; "highlight.js-8.2.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -30376,13 +30682,13 @@ let sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; }; }; - "hyperbee-1.6.1" = { + "hyperbee-1.6.2" = { name = "hyperbee"; packageName = "hyperbee"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.1.tgz"; - sha512 = "MqGw1q2cXi0PX7pbQupbZPCu6L2myyMftiUPWFdIm09gLHETdpoXoeWm7w2R6dSoDgVHXBKdSzBo0Q0o/CpPPQ=="; + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.2.tgz"; + sha512 = "0pn4srJRD8edAOfJpSsdYGO9bwteD+A9OzHjjZZrfIdWZXXwtg862Wi/6L6JZhJ9ITfhlkEZTYJnOwi+wNwWqA=="; }; }; "hypercore-7.7.1" = { @@ -31528,6 +31834,15 @@ let sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="; }; }; + "internmap-2.0.1" = { + name = "internmap"; + packageName = "internmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/internmap/-/internmap-2.0.1.tgz"; + sha512 = "Ujwccrj9FkGqjbY3iVoxD1VV+KdZZeENx0rphrtzmRXbFvkFO88L80BL/zeSIguX/7T+y8k04xqtgWgS5vxwxw=="; + }; + }; "interpret-1.1.0" = { name = "interpret"; packageName = "interpret"; @@ -33535,15 +33850,6 @@ let sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; }; - "jest-get-type-24.9.0" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"; - sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; - }; - }; "jest-get-type-25.2.6" = { name = "jest-get-type"; packageName = "jest-get-type"; @@ -33553,6 +33859,15 @@ let sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; }; }; + "jest-get-type-26.3.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; + }; + }; "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -33589,15 +33904,6 @@ let sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; - "jest-validate-24.9.0" = { - name = "jest-validate"; - packageName = "jest-validate"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz"; - sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; - }; - }; "jest-validate-25.5.0" = { name = "jest-validate"; packageName = "jest-validate"; @@ -33607,6 +33913,15 @@ let sha512 = "okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ=="; }; }; + "jest-validate-26.6.2" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz"; + sha512 = "NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ=="; + }; + }; "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; @@ -34057,49 +34372,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.32.0" = { + "jsii-1.33.0" = { name = "jsii"; packageName = "jsii"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.32.0.tgz"; - sha512 = "Vw/xjiRgMdb+wbSSUaA7DTvVfSYfCR0k8Gdei43xSOOqmRfyLsmrWkN4ypnsbfaWfEYLpTj/HXGc4rJmw9Vnrw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.33.0.tgz"; + sha512 = "0WIWlrRtoQNrp7iyEyNMoPRzvjd2EK8/Zgn/tWyzpjaMZur9HevZuk4lduCthTly/Gs9A7u1Ajdyp1cBrALeBQ=="; }; }; - "jsii-pacmak-1.32.0" = { + "jsii-pacmak-1.33.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.32.0.tgz"; - sha512 = "zH+5ys4w9rSz7ZbfDTX0XZ8zhqpoygikuAppiWWVqjMmdk8qqZUgY9fLncZliMnI42YCXSz7q43g4tVL7dd3ng=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.33.0.tgz"; + sha512 = "STcsk5wmAlJSCEzl5nTPAJ5emSZLIPJYoYjBCMcwv62MI1B4zozSSsmbpI/4oPQWh9c2fD2CJIEbwyct4KTPKQ=="; }; }; - "jsii-reflect-1.32.0" = { + "jsii-reflect-1.33.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.32.0.tgz"; - sha512 = "BJN8pgxSa3LlP5yPfxtaviSjsHKpG9b4xOr2kXv6w/SElIX15Q5/tKauI4/ZHTnBHGimRWh9ACNtxXAxvH0Vqg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.33.0.tgz"; + sha512 = "FH3lextueMXDFezWEPRYNEmEDcFg2Tvh4Wdjs0tBi+oSmewK3I+xCAVXmnpE8CRC2RW1zOLutH9hQbQnrKtsOw=="; }; }; - "jsii-rosetta-1.32.0" = { + "jsii-rosetta-1.33.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.32.0.tgz"; - sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.33.0.tgz"; + sha512 = "cUhDs2V2wYg7LFgm/X/uken8oF9re3vRORD08s0+z9Re8tt0pEehKmCotx3HYFhYrRhCEVvm66xjQt0t62GzXg=="; }; }; - "jsii-srcmak-0.1.323" = { + "jsii-srcmak-0.1.327" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.323"; + version = "0.1.327"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.323.tgz"; - sha512 = "7LBVa0cUitJdn72YhlmkxW6CWz2TMJZ4q4a0NgvTyinkC3VDJhn232+aOlORrAxVnDLzyLQZZPbAVn3WjtIM8A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.327.tgz"; + sha512 = "ur7gwDTs7eTRSxjGvYz9Yw63g2pT8ONy5RSnoeqO/6rSqVt9v6B5u9BpF/+Ros+vpOltQvdSbL5ulta0uDQzow=="; }; }; "json-bigint-1.0.0" = { @@ -34399,13 +34714,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.293" = { + "json2jsii-0.1.298" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.293"; + version = "0.1.298"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.293.tgz"; - sha512 = "xIBN0udqvxYBDnC93JZT1pjGRGSzCxY2nSImQz454b7zv1S6SW0xM3LM3uY8wvXHZaUnwkNMPvHDZTXK3GDIZA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.298.tgz"; + sha512 = "EWWINkRSEGvKI+9ejJGFceL6deZniUhxFd6IdDUCO/YrXie5H0A4vigdwlgURGTUhWNobjzi7ROL+uXL7KTpWA=="; }; }; "json3-3.2.6" = { @@ -35786,15 +36101,6 @@ let sha512 = "tq7AAMpjQ9sl58pW/qis/vOBzN7MCQ4F4n+ox4VQhyv1qVA+P2LgJq36I1Y6b4RX68+hK48u1eHDzSt527fEXA=="; }; }; - "lightning-3.3.16" = { - name = "lightning"; - packageName = "lightning"; - version = "3.3.16"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.16.tgz"; - sha512 = "5rltlQighO0X6IjTbdsabtfT3ZY3kE6MZN6jmK4wz6Jt3eikxMbmzVBC5/UeyMb/3Fad3iHJIneXuhu76/eY/A=="; - }; - }; "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; @@ -35813,13 +36119,13 @@ let sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; }; }; - "lightning-3.5.0" = { + "lightning-4.0.0" = { name = "lightning"; packageName = "lightning"; - version = "3.5.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.5.0.tgz"; - sha512 = "6Kj1JX8tG3JiV5LXYGuZkKckiRJ/OU8ukb/R5qsp7RWq/xw32LDccCKvOK8oRnOGw9K+G8jcZAOY21exr9OSFA=="; + url = "https://registry.npmjs.org/lightning/-/lightning-4.0.0.tgz"; + sha512 = "HtEF7Lsw8qdEeQTsYY6c6QK6PFrG0YV3OBPWL6VnsAr25t+HDEsH/Fna6EIivqrQ8SVDjqX5YwMcAhunTelaVA=="; }; }; "lilconfig-2.0.3" = { @@ -35975,15 +36281,6 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; - "ln-service-51.10.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.1.tgz"; - sha512 = "fXsA/gDh65+YYVYJ6GNDB2ALPa0rjXV59I9kgciOCkgiJo3F7AYkhNULYIGu0r2FK83J1M85AsH6tycImRVWRQ=="; - }; - }; "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; @@ -36002,22 +36299,13 @@ let sha512 = "1SU0eG9/LDy6k3UGXaahmoe1wOahAJkaidWpLX5Nmlfq72I0arad420smma5ZGXAW4wNlGR/gx68KZzzYI5D4A=="; }; }; - "ln-service-51.9.0" = { + "ln-service-52.0.0" = { name = "ln-service"; packageName = "ln-service"; - version = "51.9.0"; + version = "52.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.9.0.tgz"; - sha512 = "4lbC1QZ/a4BuvO/0wd8DxRr5DxdYGugENoDo9X8xnUts9tGmYLb7g5yEXuk/Ff2LPTVUlK5imAsduobUVXOzlA=="; - }; - }; - "ln-sync-0.4.6" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.6.tgz"; - sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.0.0.tgz"; + sha512 = "JxGGEqu1MJ1jnJN0cWWBsmEqi9qwbvsfM/AHslvKv7WHhMYFthp9HgGGcLn23oiYMM1boGtvqtkWuvqMf9P8AQ=="; }; }; "ln-sync-0.4.7" = { @@ -36029,13 +36317,13 @@ let sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; }; }; - "ln-telegram-3.2.9" = { + "ln-telegram-3.2.10" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.9"; + version = "3.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.9.tgz"; - sha512 = "pjAkD1VLGLvwu1Dso3HvQDcK25L/slRX8nB7hTDDEznn+rRzxBJd1sXuNaFovwJHughvK3ZxUxAHC0BfzIatEw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.10.tgz"; + sha512 = "FEI6wPb/DzpzwfWV8PPFPWq/OSWp6ETv7rEofCTCCodd/hRQGzXoJ7mDmyKFTune5TASXDBMlghol/EgZswkNg=="; }; }; "load-ip-set-2.2.1" = { @@ -37577,13 +37865,13 @@ let sha512 = "U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="; }; }; - "log-process-errors-5.1.2" = { + "log-process-errors-6.3.0" = { name = "log-process-errors"; packageName = "log-process-errors"; - version = "5.1.2"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-5.1.2.tgz"; - sha512 = "s4kmYHrzj543xUAIxc/cpmoiGZcbFwKRqqwO49DbgH+hFoSTswi0sYZuJKjUUc73b49MRPQGl0CNl8cx98/Wtg=="; + url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-6.3.0.tgz"; + sha512 = "dHwGgWFuz9LUDoLIG7E0SlDurosfZEpgNLJMPzNL9GPdyh4Wdm5RJlQbuqy3Pj2wOcbDzykeTCBEqyrwriqPnA=="; }; }; "log-symbols-1.0.2" = { @@ -38054,13 +38342,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.0.1" = { + "luxon-2.0.2" = { name = "luxon"; packageName = "luxon"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.0.1.tgz"; - sha512 = "8Eawf81c9ZlQj62W3eq4mp+C7SAIAnmaS7ZuEAiX503YMcn+0C1JnMQRtfaQj6B5qTZLgHv0F4H5WabBCvi1fw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.0.2.tgz"; + sha512 = "ZRioYLCgRHrtTORaZX1mx+jtxKtKuI5ZDvHNAmqpUzGqSrR+tL4FVLn/CUGMA3h0+AKD1MAxGI5GnCqR5txNqg=="; }; }; "lzma-native-6.0.1" = { @@ -39512,13 +39800,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.4" = { + "mermaid-8.11.5" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.4"; + version = "8.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.4.tgz"; - sha512 = "iUJylv5VmsOm/6dkAVpSYRSD8iZ8NOjuiHG0Q6nMgPdmmQ9xy8z61v8MuRZn81K51JlvOeWMN06blejmsMQHqg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.5.tgz"; + sha512 = "lbIaDQlFoIQLxnLy8hZgfS6L7gt2Wxlk83fudLslUEhj4yafHyVjzGOlojJQxgsLU5khEANhxLbo0xebtOrhXQ=="; }; }; "meros-1.1.4" = { @@ -39656,15 +39944,6 @@ let sha512 = "y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg=="; }; }; - "micro-memoize-2.1.2" = { - name = "micro-memoize"; - packageName = "micro-memoize"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-2.1.2.tgz"; - sha512 = "COjNutiFgnDHXZEIM/jYuZPwq2h8zMUeScf6Sh6so98a+REqdlpaNS7Cb2ffGfK5I+xfgoA3Rx49NGuNJTJq3w=="; - }; - }; "micro-memoize-4.0.9" = { name = "micro-memoize"; packageName = "micro-memoize"; @@ -40592,15 +40871,6 @@ let sha1 = "114c949673e2a8a35e9d35788527aa37b679da2b"; }; }; - "moize-5.4.7" = { - name = "moize"; - packageName = "moize"; - version = "5.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-5.4.7.tgz"; - sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; - }; - }; "moize-6.0.3" = { name = "moize"; packageName = "moize"; @@ -40736,15 +41006,6 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "move-file-1.2.0" = { - name = "move-file"; - packageName = "move-file"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/move-file/-/move-file-1.2.0.tgz"; - sha512 = "USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA=="; - }; - }; "move-file-2.1.0" = { name = "move-file"; packageName = "move-file"; @@ -41817,22 +42078,22 @@ let sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; - "netlify-headers-parser-2.1.1" = { + "netlify-headers-parser-3.0.1" = { name = "netlify-headers-parser"; packageName = "netlify-headers-parser"; - version = "2.1.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-2.1.1.tgz"; - sha512 = "zIVVKf2+5Y/m/dx1+uLdh4xrqf7X6sDFKhFj/RHeyBS8ArqnyAF9vkm3uS0WqByfMpBTmpqZKNXPlJ8dTNihWQ=="; + url = "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-3.0.1.tgz"; + sha512 = "32oDkPa7+JdTFOp0M4H31AZDQ8YVJWgNlPkPuilb1C1dgvmAFXa8k4x+ADpgCbQfTMP3exO3vobvlfj8SUHxnA=="; }; }; - "netlify-redirect-parser-10.1.0" = { + "netlify-redirect-parser-11.0.2" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "10.1.0"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-10.1.0.tgz"; - sha512 = "lnNp2nlyFajv3/hQmIDjzhkB6B8TqFd/5HUE9oPd16DK0S0tERiwPiZaL25XroBJFU4nvZM4xSPN907YiGcY0w=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.2.tgz"; + sha512 = "ngGSxRUv8dsao586J0MsfQFpi66TnIlYND1KRl1vCgjuuMBzvO9WbV8maqJA9d0G6f9NVKb+LqufmOQj4AkkFw=="; }; }; "netlify-redirector-0.2.1" = { @@ -43871,13 +44132,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.32.0" = { + "oo-ascii-tree-1.33.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.32.0"; + version = "1.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.32.0.tgz"; - sha512 = "QCYSWgdhbQwvMzw1OguyZ+K2KwZeQ1xvhFXa0/XV8XfmUXgr07MlnUoNthntfYgY6w7w+KI8WvqIxr+Q/NF5gw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.33.0.tgz"; + sha512 = "pthBVMVqOl3GZ6t9WjgLP9p24Oz4oVQCabhhIsY+nG9rywUtHOfqgmSm5AD3BbrJc0cP84dyDJFVlu/bVaKyjw=="; }; }; "opal-runtime-1.0.11" = { @@ -46481,6 +46742,15 @@ let sha512 = "drPtqkkSf0ufx2gaea3TryFiBHdNIdXKf5LN0hTM82SXI4xVIve2wLwNg92e1MT6m3jASLu6VO7eGY6+mmGeyw=="; }; }; + "pino-6.13.0" = { + name = "pino"; + packageName = "pino"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-6.13.0.tgz"; + sha512 = "mRXSTfa34tbfrWqCIp1sUpZLqBhcoaGapoyxfEwaWwJGMpLijlRdDKIQUyvq4M3DUfFH5vEglwSw8POZYwbThA=="; + }; + }; "pino-std-serializers-3.2.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; @@ -46968,15 +47238,6 @@ let sha512 = "BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="; }; }; - "postcss-8.3.4" = { - name = "postcss"; - packageName = "postcss"; - version = "8.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.4.tgz"; - sha512 = "/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA=="; - }; - }; "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; @@ -47886,15 +48147,6 @@ let sha512 = "zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw=="; }; }; - "pretty-format-24.9.0" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "24.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"; - sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA=="; - }; - }; "pretty-format-25.5.0" = { name = "pretty-format"; packageName = "pretty-format"; @@ -47931,15 +48183,6 @@ let sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; - "pretty-ms-5.1.0" = { - name = "pretty-ms"; - packageName = "pretty-ms"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-5.1.0.tgz"; - sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw=="; - }; - }; "pretty-ms-7.0.1" = { name = "pretty-ms"; packageName = "pretty-ms"; @@ -49596,13 +49839,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.161" = { + "pyright-1.1.162" = { name = "pyright"; packageName = "pyright"; - version = "1.1.161"; + version = "1.1.162"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; - sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.162.tgz"; + sha512 = "3YEM8rf/39CtuHMzZmVjsV/2cJJB6N3RfCuNR5QgUeib0VRQ303zhb4jh5RRRF9P6JpZku/waX+i16TrfSqDEQ=="; }; }; "q-0.9.7" = { @@ -50406,13 +50649,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.15.0" = { + "react-devtools-core-4.16.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.15.0"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.15.0.tgz"; - sha512 = "Y1NwrWSKRg4TtwcES2upzXFDmccAW9jrGQG2D8EGQrZhK+0hmuhgFnSdKpFc3z04CSeDT5t83RMXcmX5TkR1dA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.16.0.tgz"; + sha512 = "fqyVbp+wVVey6O4uVBk5s3J/vTiPludp7lulr6a8asTBm7DIA0vLBbjmAOLCnOlkWcgdy4mjsqOgNCbu8uICWw=="; }; }; "react-dom-16.14.0" = { @@ -52854,6 +53097,15 @@ let sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; }; + "retry-0.13.1" = { + name = "retry"; + packageName = "retry"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; + sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; + }; + }; "retry-0.6.0" = { name = "retry"; packageName = "retry"; @@ -53079,6 +53331,15 @@ let sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; + "robust-predicates-3.0.1" = { + name = "robust-predicates"; + packageName = "robust-predicates"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz"; + sha512 = "ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="; + }; + }; "rollup-1.32.1" = { name = "rollup"; packageName = "rollup"; @@ -53088,15 +53349,6 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.51.1" = { - name = "rollup"; - packageName = "rollup"; - version = "2.51.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.51.1.tgz"; - sha512 = "8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw=="; - }; - }; "rollup-2.56.2" = { name = "rollup"; packageName = "rollup"; @@ -53619,13 +53871,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.37.5" = { + "sass-1.38.0" = { name = "sass"; packageName = "sass"; - version = "1.37.5"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; - sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz"; + sha512 = "WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g=="; }; }; "sax-0.5.8" = { @@ -54690,13 +54942,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-3.5.0" = { + "sign-addon-3.7.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "3.5.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.5.0.tgz"; - sha512 = "Mc/Cg9P10Zyz8cnz8jSuvUDBnoY6rPExQf1vZvH4l5rfLZCLZVaLhJQ40QOAnbu8sE4TD2VzqB9Zogq7nTPrVA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.7.0.tgz"; + sha512 = "XPLjMCcGuP5pPJSXpqFwKguIKxcteOx6dE1Bm2j92Brsro6pZYcklOpv4ohfRNW1UQp0J2cdi9zN2oNF4lMiRg=="; }; }; "signal-exit-3.0.3" = { @@ -54780,13 +55032,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.43.0" = { + "simple-git-2.44.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.43.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.43.0.tgz"; - sha512 = "0RQa2KtHhSoukHVJvakxjvv6blEb6zqI9s81G9yT7LzekSgZLN6rIxyyDt45K4N+Dqnzwe/rWAz0miuGwNIpEQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.44.0.tgz"; + sha512 = "wIjcAmymhzgdaM0Y/a+XxmNGlivvHQTPZDYXVmyHMShVDwdeVqu3+OOyDbYu0DnfVzqLs2EOxRTgMNbC3YquwQ=="; }; }; "simple-handshake-3.0.0" = { @@ -55338,13 +55590,13 @@ let sha512 = "IYg1Kbz/juuXrZNe7UoWTyHV+QKDveahxM3y1h/gZDwoOC9fgyVlC0p0v/RyeYRtvScxQcJchCr94V1VStwroA=="; }; }; - "snyk-nuget-plugin-1.22.0" = { + "snyk-nuget-plugin-1.22.1" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.0.tgz"; - sha512 = "R0pmcEYeoM3B6BUMUf30jPQgQo8ngHW0gAabyGMnBV3ZDvJ99TCa7McSIjI/3obdT1ERIKKF6bZxuzps4uzVOA=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.1.tgz"; + sha512 = "Z/NAM7DECBTMXSGPQ9Ubc4AJsFw8ioq+UVpDQu3tkbjd83Pp0JODRjH6rElN7PnsvEADfJt8THfyC0ehXxZD/Q=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -55365,13 +55617,13 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; - "snyk-poetry-lockfile-parser-1.1.6" = { + "snyk-poetry-lockfile-parser-1.1.7" = { name = "snyk-poetry-lockfile-parser"; packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz"; - sha512 = "MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA=="; + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.7.tgz"; + sha512 = "5waaslW7odDlox3WQMouSh/BjBrKq2rolMox3Ij/Vaju8r/3eWvs7anikzJUzNKwNcLm8AR5u4ftG/hxqDJJgA=="; }; }; "snyk-policy-1.22.0" = { @@ -55383,13 +55635,13 @@ let sha512 = "torzlNhDWcoMQLcX2xsTbCXfKXE614+5YvLHxEefQPwC1JNkbCN5u3/pU0c+2RfC2cPCa1AKEBqIx5gvr6mNyQ=="; }; }; - "snyk-python-plugin-1.19.11" = { + "snyk-python-plugin-1.20.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.11"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.11.tgz"; - sha512 = "zUKbSbw+wU1FCUDYt+IDjaES0pc1UKBECOqjHSJMxWm9VhstvPtI4KccetwOfne2oUcmaEJJvcEp4s9VTK04XQ=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.20.1.tgz"; + sha512 = "BW5e5o59ev9PzwjVYmWWCgQpVIsMwK3rkEh1BYPMNHFbRC9QXvKsZmr9UX+jSo1rOWNy3fUIjh8t9NAK536YPQ=="; }; }; "snyk-resolve-1.1.0" = { @@ -55437,13 +55689,13 @@ let sha1 = "6e026f92e64af7fcccea1ee53d524841e418a212"; }; }; - "snyk-try-require-2.0.1" = { + "snyk-try-require-2.0.2" = { name = "snyk-try-require"; packageName = "snyk-try-require"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz"; - sha512 = "VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA=="; + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.2.tgz"; + sha512 = "kohtSHpe42qzS8QUi6dUv43S0O6puUt3W8j16ZAbmQhW2Rnf5TyTXL4DR4ZBQDC0uyWunuDK7KsalAlQGDNl8w=="; }; }; "socket.io-1.0.6" = { @@ -56751,13 +57003,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.44" = { + "sscaff-1.2.48" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.44"; + version = "1.2.48"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.44.tgz"; - sha512 = "oLUwVVEPpctKxqIIsVJI3EU6Dpu9GIoel1R8GduJ+xgKbOUnC3UVhBzPAIuWzOHxAML51sGAXeKfciR2PbXu/w=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.48.tgz"; + sha512 = "7CZXvV9Jw3Kj4ql+1D2o7fz1SWKLQdLt29i+nGLtiJlx+Cs7JW1i1SIwY9W1tzE+jp/P0+6tyme+yhHCby8k+w=="; }; }; "ssh-config-1.1.6" = { @@ -64187,13 +64439,13 @@ let sha512 = "QW2SFk4kln5lTPQajGNuXWtmr2z9hVA6Sfi4qPFEW2vjt2XaUAp38/1OrcUQYiJXOyXntbWN2jZJaGxg+hDUxw=="; }; }; - "vscode-json-languageservice-4.1.6" = { + "vscode-json-languageservice-4.1.7" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.6"; + version = "4.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz"; - sha512 = "DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz"; + sha512 = "cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -64925,13 +65177,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.5.1" = { + "web3-utils-1.5.2" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.1.tgz"; - sha512 = "U8ULaMBwjkp9Rn+kRLjUmgAUHwPqDrM5/Q9tPKgvuDKtMWUggTLC33/KF8RY+PyAhSAlnD+lmNGfZnbjmVKBxQ=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.2.tgz"; + sha512 = "quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q=="; }; }; "webassemblyjs-1.11.1" = { @@ -65051,13 +65303,13 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; - "webpack-cli-4.7.2" = { + "webpack-cli-4.8.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.7.2"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; - sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; }; }; "webpack-core-0.6.9" = { @@ -65231,13 +65483,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.3.9" = { + "webtorrent-1.3.10" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.9.tgz"; - sha512 = "K52E15SutGIgrBj0YzYNYgkuQMucKePdGk2zxMwLHtFh9sJ0KVPlQgkmORhSbJqC51cRVq/4Xt2jToZde8ioRQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.10.tgz"; + sha512 = "w0+y6YRyfdS37on5ialAyxpM8XzIB6nFWZOO1O9MgMzG8asLEa1uJ7aGfXoZ+030FCRj235eyhzlnTxYEWBvKg=="; }; }; "well-known-symbols-2.0.0" = { @@ -66059,13 +66311,13 @@ let sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; }; }; - "ws-8.0.0" = { + "ws-8.1.0" = { name = "ws"; packageName = "ws"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz"; - sha512 = "6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA=="; + url = "https://registry.npmjs.org/ws/-/ws-8.1.0.tgz"; + sha512 = "0UWlCD2s3RSclw8FN+D0zDTUyMO+1kHwJQQJzkgUh16S8d3NYON0AKCEQPffE0ez4JyRFu76QDA9KR5bOG/7jw=="; }; }; "x-default-browser-0.3.1" = { @@ -66437,6 +66689,16 @@ let sha512 = "iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg=="; }; }; + "xmldom-git://github.com/xmldom/xmldom#0.7.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.7.0"; + src = fetchgit { + url = "git://github.com/xmldom/xmldom"; + rev = "c568938641cc1f121cef5b4df80fcfda1e489b6e"; + sha256 = "98ae57c19ccf66bc4d67e649250f1c28adda223064fb3c8572d245cb5aa3d440"; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -66825,6 +67087,15 @@ let sha512 = "SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg=="; }; }; + "yargs-17.1.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; + sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -67286,7 +67557,7 @@ in sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@schematics/angular-12.2.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" @@ -68213,7 +68484,7 @@ in sources."hrpc-2.2.0" sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" - sources."hyperbee-1.6.1" + sources."hyperbee-1.6.2" sources."hypercore-9.10.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ @@ -68664,7 +68935,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -69088,13 +69359,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.2" // { + (sources."@vue/compiler-core-3.2.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.2" - sources."@vue/shared-3.2.2" + sources."@vue/compiler-dom-3.2.3" + sources."@vue/shared-3.2.3" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69154,7 +69425,7 @@ in sources."assign-symbols-1.0.0" sources."ast-types-0.13.3" sources."async-2.6.3" - sources."async-retry-1.3.1" + sources."async-retry-1.3.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -69273,12 +69544,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.16.1" + sources."core-js-pure-3.16.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -69344,7 +69615,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.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69829,7 +70100,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."rss-parser-3.12.0" @@ -70368,7 +70639,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.805" + sources."electron-to-chromium-1.3.808" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70499,7 +70770,7 @@ in sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001251" sources."colorette-1.3.0" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.74" @@ -70533,7 +70804,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.969.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -70737,10 +71008,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.7"; + version = "10.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.7.tgz"; - sha512 = "RDXgQytDEdr0mOIbh0j1kuI7RjMWznSCX/0QtsS4fcpbuDhKLGripPbFPfdV83jQWzCKRpGdowg98jc9izXs6Q=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.8.tgz"; + sha512 = "lBtaJP9EmDdvaYcsjvKhkS84sG79uZwhhoZ/Xb8Onj1FS8zwLPWFqzpRZ1SJ32COq9aJUWumLD+6LCnWH6Xbsg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -70817,8 +71088,12 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.0" - sources."asyncjs-util-1.2.6" + sources."async-3.2.1" + (sources."asyncjs-util-1.2.6" // { + dependencies = [ + sources."async-3.2.0" + ]; + }) sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" @@ -70919,7 +71194,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-6.2.1" @@ -71000,6 +71275,7 @@ in sources."global-dirs-3.0.0" (sources."goldengate-10.1.0" // { dependencies = [ + sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" @@ -71102,6 +71378,7 @@ in (sources."lightning-3.3.9" // { dependencies = [ sources."@types/node-15.6.1" + sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" @@ -71115,6 +71392,7 @@ in sources."@grpc/proto-loader-0.6.3" sources."@types/node-15.12.5" sources."@types/ws-7.4.5" + sources."async-3.2.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" sources."lightning-3.3.12" @@ -71123,20 +71401,18 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.10.1" // { + (sources."ln-service-52.0.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.6" + sources."@grpc/grpc-js-1.3.7" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.4.3" - sources."@types/request-2.48.6" + sources."@types/node-16.6.0" + sources."@types/request-2.48.7" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" - sources."cbor-7.0.6" sources."form-data-2.5.1" - sources."lightning-3.5.0" - sources."nofilter-2.0.3" - sources."ws-8.0.0" + sources."lightning-4.0.0" + sources."ws-8.1.0" ]; }) (sources."ln-sync-0.4.7" // { @@ -71147,42 +71423,16 @@ in sources."@types/node-16.3.3" sources."@types/request-2.48.6" sources."@types/ws-7.4.7" + sources."async-3.2.0" sources."bn.js-5.2.0" sources."cbor-7.0.6" + sources."colorette-1.2.2" sources."form-data-2.5.1" sources."lightning-3.4.0" sources."nofilter-2.0.3" ]; }) - (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.6" - 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."cbor-7.0.5" - sources."lightning-3.3.12" - ]; - }) - sources."nofilter-2.0.3" - sources."ws-7.5.3" - ]; - }) + sources."ln-telegram-3.2.10" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -71203,7 +71453,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.0.1" + sources."luxon-2.0.2" (sources."macaroon-3.0.4" // { dependencies = [ sources."tweetnacl-1.0.3" @@ -71280,6 +71530,7 @@ in sources."@grpc/proto-loader-0.6.3" sources."@types/node-15.12.5" sources."@types/ws-7.4.5" + sources."async-3.2.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" sources."lightning-3.3.12" @@ -71297,6 +71548,7 @@ in sources."prettyjson-1.2.1" (sources."probing-1.3.6" // { dependencies = [ + sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."invoices-1.2.1" @@ -72564,7 +72816,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.43.0" + sources."simple-git-2.44.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -73062,7 +73314,8 @@ in sha512 = "0xRmM6/5EwTbzpqinQujvrVZKJhTkLfD8hXEuSASNAv/5uKLRa5pfdOD53ALq7n0eVeOqZaGNtwKhGRcPuNDxw=="; }; dependencies = [ - sources."@jsii/spec-1.32.0" + sources."@jsii/check-node-1.33.0" + sources."@jsii/spec-1.33.0" sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -73073,9 +73326,10 @@ in sources."case-1.6.3" sources."cdk8s-1.0.0-beta.27" sources."cdk8s-plus-17-1.0.0-beta.42" + sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.32.0" // { + (sources."codemaker-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73083,8 +73337,8 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.4.0" - sources."commonmark-0.29.3" - sources."constructs-3.3.121" + sources."commonmark-0.30.0" + sources."constructs-3.3.125" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73115,6 +73369,7 @@ in sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" @@ -73135,37 +73390,37 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.32.0" // { + (sources."jsii-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.32.0" // { + (sources."jsii-pacmak-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.32.0" // { + (sources."jsii-reflect-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.32.0" // { + (sources."jsii-rosetta-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.323" // { + (sources."jsii-srcmak-0.1.327" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.293" + sources."json2jsii-0.1.298" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73181,7 +73436,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.32.0" + sources."oo-ascii-tree-1.33.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -73201,7 +73456,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.44" + sources."sscaff-1.2.48" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -73212,6 +73467,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" sources."tslib-2.3.1" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" @@ -73222,7 +73478,7 @@ in sources."which-typed-array-1.1.6" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" - sources."xmldom-0.6.0" + sources."xmldom-git://github.com/xmldom/xmldom#0.7.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -73256,7 +73512,7 @@ in sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@apollo/client-3.4.7" + sources."@apollo/client-3.4.8" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -73302,15 +73558,15 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.2.0" // { + (sources."@graphql-tools/mock-8.2.1" // { dependencies = [ - sources."@graphql-tools/utils-8.1.0" + sources."@graphql-tools/utils-8.1.1" ]; }) - (sources."@graphql-tools/schema-8.1.0" // { + (sources."@graphql-tools/schema-8.1.1" // { dependencies = [ - sources."@graphql-tools/merge-8.0.0" - sources."@graphql-tools/utils-8.1.0" + sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/utils-8.1.1" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -73320,7 +73576,8 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/spec-1.32.0" + sources."@jsii/check-node-1.33.0" + sources."@jsii/spec-1.33.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73375,7 +73632,7 @@ in sources."apollo-server-caching-3.0.1" (sources."apollo-server-core-3.1.2" // { dependencies = [ - sources."@graphql-tools/utils-8.1.0" + sources."@graphql-tools/utils-8.1.1" ]; }) sources."apollo-server-env-4.0.3" @@ -73395,7 +73652,7 @@ in sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."async-3.2.1" - sources."async-retry-1.3.1" + sources."async-retry-1.3.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" @@ -73456,14 +73713,14 @@ in sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" - sources."commonmark-0.29.3" + sources."commonmark-0.30.0" (sources."compress-commons-4.1.1" // { dependencies = [ sources."normalize-path-3.0.0" ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.121" + sources."constructs-3.3.125" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73473,7 +73730,7 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.16.1" + sources."core-js-pure-3.16.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."crc-32-1.2.0" @@ -73635,35 +73892,35 @@ in sources."iterall-1.3.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.32.0" // { + (sources."jsii-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.32.0" // { + (sources."jsii-pacmak-1.33.0" // { dependencies = [ sources."clone-2.1.2" - sources."codemaker-1.32.0" + sources."codemaker-1.33.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.32.0" // { + (sources."jsii-reflect-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.32.0" // { + (sources."jsii-rosetta-1.33.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.323" // { + (sources."jsii-srcmak-0.1.327" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73728,7 +73985,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.32.0" + sources."oo-ascii-tree-1.33.0" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -73764,7 +74021,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-16.14.0" - sources."react-devtools-core-4.15.0" + sources."react-devtools-core-4.16.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -73777,7 +74034,7 @@ in sources."reserved-words-0.1.2" sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."run-async-2.4.1" @@ -73821,7 +74078,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.44" + sources."sscaff-1.2.48" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -73893,7 +74150,7 @@ in sources."wrappy-1.0.2" sources."ws-7.5.3" sources."xmlbuilder-15.1.1" - sources."xmldom-0.6.0" + sources."xmldom-git://github.com/xmldom/xmldom#0.7.0" sources."xss-1.0.9" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -74258,10 +74515,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.14"; + version = "0.18.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.14.tgz"; - sha512 = "nfJl0hw1/fMhXbaSNEVBHUQTUIGfiBRVQ5KLmYO4gJ7pNvhIcEUas+DKKONDr3WtmV3ZlEWmR0SbvVnaRzKB5w=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.15.tgz"; + sha512 = "YXwbqzvEKo2fT2srqhESG3KOzz1mZ8V4SY/T8fLo2yxY1C14m7Bol2rqP+7VI+tXwaKXWbnMoQRDgOTjgL2oxQ=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -74494,7 +74751,7 @@ in sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.6" // { + (sources."vscode-json-languageservice-4.1.7" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -74561,7 +74818,7 @@ in sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.3.4" + sources."@chemzqm/neovim-5.3.5" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -74912,7 +75169,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -74948,7 +75205,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75747,13 +76004,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.161"; + version = "1.1.162"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.161.tgz"; - sha512 = "CFWLqQ3t0o73tioZHqJip0avZ7K9p9sBCMz81voAkBDoaSvUvrqT/SGpbhwXjzsvwBF6H1WY9aEK8FDMVAh+XA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.162.tgz"; + sha512 = "FD/aHp65QH2dDH3+0vdEPfJi7BVndL6DFa1OF+87OHQZ+wCuMPfFWcd1/izj8y907cpwv1/nCg9y/lvxJfrrRg=="; }; dependencies = [ - sources."pyright-1.1.161" + sources."pyright-1.1.162" ]; buildInputs = globalBuildInputs; meta = { @@ -75863,10 +76120,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.3.tgz"; - sha512 = "1vIMSDI8zKbr7J/jD4Ey9EFfYnipRaYzbaY9WZHnStEb0H2M/obIjwl5k9gRFGfJV00vB7zDpHp19FXLXVqzhQ=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.4.tgz"; + sha512 = "vlb40ZzIob1sjxzMZL484QT+hlsxKto2oZ6w+dnr45CyWJE/OL+fIlBMiy+xELYuxLXxkfLy1dz8d3N4PDy57A=="; }; buildInputs = globalBuildInputs; meta = { @@ -75997,7 +76254,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76371,10 +76628,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.3.tgz"; - sha512 = "dOvu5TY1zuZ/d7l/v3pGhbgYrhBVQSsmTiLNUL1dYzXCuVUuzNNm5CzZcr8yLTr3diCPU2eavLKs8iBwBvs/8g=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.5.tgz"; + sha512 = "wFjtKm9KeXOpI/po5unbnju1H6/pm1wT3fHHfNo3LYF5PVKgz39Suvv09XCEAUSBC5PPu8wXNZLoBeVRMI4yuQ=="; }; dependencies = [ sources."typescript-4.3.5" @@ -76859,7 +77116,7 @@ in sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -78950,11 +79207,11 @@ in sources."@types/fs-extra-8.1.2" sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" - sources."@types/mime-types-2.1.0" + sources."@types/mime-types-2.1.1" sources."@types/node-14.17.9" sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" - sources."@types/rc-1.1.0" + sources."@types/rc-1.2.0" sources."@types/react-16.14.13" sources."@types/react-dom-16.9.14" sources."@types/react-virtualized-9.21.13" @@ -79051,8 +79308,8 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.1" - (sources."core-js-compat-3.16.1" // { + sources."core-js-3.16.2" + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79077,8 +79334,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.1.9" - sources."electron-to-chromium-1.3.805" + sources."electron-13.2.0" + sources."electron-to-chromium-1.3.808" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -79357,7 +79614,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.37.5" // { + (sources."sass-1.38.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -79532,10 +79789,10 @@ in diagnostic-languageserver = nodeEnv.buildNodePackage { name = "diagnostic-languageserver"; packageName = "diagnostic-languageserver"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.12.0.tgz"; - sha512 = "oXWAYO2ACrjFRYPTqUOQz3gCE7U1R5HVkuiqXXTFCcujiAprJjzvV5VAjrJolgA7guyRrXE5HliuDGoWJfWHOw=="; + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.12.1.tgz"; + sha512 = "guR2r4tNIJBXmR0sx1JpBQ+/T5h5vsAdjcixFNcSOoSG7TD3MYnS3iC0OJ6HMFsyM+gR2siTBQXVaK3s04PrOw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -79942,7 +80199,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -80590,7 +80847,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -80724,7 +80981,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.15.0" + sources."react-devtools-core-4.16.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -82112,7 +82369,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.37.5" // { + (sources."sass-1.38.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -83090,7 +83347,7 @@ in }) sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@react-native-community/cli-debugger-ui-5.0.1" (sources."@react-native-community/cli-server-api-5.0.1" // { dependencies = [ @@ -83476,7 +83733,7 @@ in sources."semver-6.3.0" ]; }) - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."browserslist-4.16.7" sources."semver-7.0.0" @@ -83609,7 +83866,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -85325,7 +85582,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -85419,7 +85676,7 @@ in sources."puppeteer-9.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.15.0" + sources."react-devtools-core-4.16.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -85540,7 +85797,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -86186,10 +86443,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.16.4"; + version = "9.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.4.tgz"; - sha512 = "cWcjwPUIgO1bKzzJADd+roAlM0IyWbaUUuOuUQlW8YU9VFP/f/mF7bOu4ys+faIyZCqPwiX9BXOb+PEYWJm0nA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.5.tgz"; + sha512 = "dp/cvt+39wv5CO+MzX36snmRnvn5j7Nn73QfKiIvHXAT5Ek/fRJn2pWnaxP+bhd19SuEY1Buf8PcdlMl42hzlw=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -86202,7 +86459,7 @@ 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.3" // { + (sources."@google-cloud/pubsub-2.16.4" // { dependencies = [ sources."google-auth-library-7.6.1" ]; @@ -86585,7 +86842,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.24.0" // { + (sources."google-gax-2.24.1" // { dependencies = [ sources."google-auth-library-7.6.1" ]; @@ -87515,7 +87772,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.5.1" + sources."web3-utils-1.5.2" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -88242,7 +88499,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.31.0" + sources."contentful-management-7.32.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -88288,7 +88545,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -88810,10 +89067,10 @@ in sources."@octokit/openapi-types-9.7.0" sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.7.0" + sources."@octokit/plugin-rest-endpoint-methods-5.8.0" sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.0" + sources."@octokit/rest-18.9.1" sources."@octokit/types-6.25.0" sources."@types/normalize-package-data-2.4.1" sources."agent-base-4.3.0" @@ -89259,7 +89516,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" sources."ajv-8.6.2" - sources."ajv-formats-2.1.0" + sources."ajv-formats-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -89698,10 +89955,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.1.0" // { + (sources."@graphql-tools/schema-8.1.1" // { dependencies = [ - sources."@graphql-tools/merge-8.0.0" - sources."@graphql-tools/utils-8.1.0" + sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/utils-8.1.1" sources."tslib-2.3.1" ]; }) @@ -90024,7 +90281,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."oas-schema-walker-1.1.5" @@ -90137,7 +90394,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."symbol-observable-1.2.0" @@ -92596,7 +92853,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."wawoff2-2.0.0" @@ -92747,10 +93004,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.2.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.2.2.tgz"; - sha512 = "IM+wgl9psrsn7l13VDnDCNH90QiGqkE4gXFcsn6eMSsKnKR/op57WXbS/JwJuokXDIB+obZqVWLaJeSdIx9Lcw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.3.2.tgz"; + sha512 = "Gg0s1NP2mRJqzv68aT8cdt2+71iSYLDTWusAmlX7c8g13ZniSzCEHXywFvpILYm76lzCWxMazPleZhEEuBjqxQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -92821,22 +93078,22 @@ in sources."@babel/types-7.15.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.32" - sources."@joplin/fork-sax-1.2.36" - sources."@joplin/lib-2.2.4" - (sources."@joplin/renderer-2.2.4" // { + sources."@joplin/fork-htmlparser2-4.1.33" + sources."@joplin/fork-sax-1.2.37" + sources."@joplin/lib-2.3.1" + (sources."@joplin/renderer-2.3.1" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.54" // { + (sources."@joplin/turndown-4.0.55" // { dependencies = [ sources."css-2.2.4" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.36" + sources."@joplin/turndown-plugin-gfm-1.0.37" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -92853,7 +93110,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.2" @@ -92947,7 +93204,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.969.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93172,7 +93429,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -93320,7 +93577,7 @@ in ]; }) sources."he-1.2.0" - sources."highlight.js-10.7.3" + sources."highlight.js-11.2.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -93521,7 +93778,7 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."mermaid-8.11.4" + sources."mermaid-8.11.5" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -95148,7 +95405,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -96554,7 +96811,7 @@ in sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@octokit/auth-token-2.4.5" sources."@octokit/core-3.5.1" (sources."@octokit/endpoint-6.0.12" // { @@ -96567,14 +96824,14 @@ in sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.7.0" + sources."@octokit/plugin-rest-endpoint-methods-5.8.0" (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.0" + sources."@octokit/rest-18.9.1" sources."@octokit/types-6.25.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" @@ -98310,7 +98567,7 @@ in sources."assign-symbols-1.0.0" sources."async-3.2.1" sources."async-each-1.0.3" - sources."async-retry-1.3.1" + sources."async-retry-1.3.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -98496,7 +98753,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -98548,7 +98805,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -98976,7 +99233,7 @@ in sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."rollup-1.32.1" @@ -99863,7 +100120,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -100036,7 +100293,7 @@ in sources."devtools-protocol-0.0.901419" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -100207,7 +100464,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge2-1.4.1" - sources."mermaid-8.11.4" + sources."mermaid-8.11.5" sources."micromatch-4.0.4" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -101083,10 +101340,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.3.5"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.3.5.tgz"; - sha512 = "ve09paxF4/aoPDScVMt+N/oRoiWLad4xF2HHWHGAq0PJFah13W6Q/9rQADafxgVBk1OHFN6zW1WOJGZCdH3+pQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.5.4.tgz"; + sha512 = "beDMd9oXPkfq9vGT58ftWa6qOaR4G9lTzCI2I0y2VKd304ijYzWbW6NkxUHRoPJjRdyxYPWklZtdQ9iw5vMMlQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101219,48 +101476,27 @@ in sources."@bugsnag/node-7.11.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" - sources."@jest/types-24.9.0" + sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.2.7" // { + (sources."@netlify/build-18.2.11" // { dependencies = [ - sources."ansi-styles-4.3.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."is-plain-obj-2.1.0" - sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" - sources."type-fest-0.8.1" - (sources."update-notifier-4.1.3" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) ]; }) - (sources."@netlify/cache-utils-2.0.1" // { + (sources."@netlify/cache-utils-2.0.2" // { dependencies = [ sources."del-5.1.0" - sources."locate-path-5.0.0" sources."p-map-3.0.0" sources."slash-3.0.0" ]; }) - (sources."@netlify/config-15.3.0" // { + (sources."@netlify/config-15.3.4" // { dependencies = [ sources."dot-prop-5.3.0" - sources."is-plain-obj-2.1.0" ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.8.0" // { - dependencies = [ - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) + sources."@netlify/framework-info-5.9.0" sources."@netlify/functions-utils-2.0.2" (sources."@netlify/git-utils-2.0.1" // { dependencies = [ @@ -101298,7 +101534,6 @@ in sources."ansi-styles-4.3.0" sources."cliui-7.0.4" sources."cp-file-9.1.0" - sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" @@ -101315,6 +101550,7 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/color-0.1.2" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" (sources."chalk-3.0.0" // { dependencies = [ @@ -101354,7 +101590,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.29" // { + (sources."@oclif/core-0.5.30" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."ansi-styles-4.3.0" @@ -101398,6 +101634,7 @@ in (sources."@oclif/plugin-not-found-1.2.4" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."clean-stack-2.2.0" @@ -101434,14 +101671,14 @@ in sources."@octokit/openapi-types-9.7.0" sources."@octokit/plugin-paginate-rest-2.15.1" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.7.0" + sources."@octokit/plugin-rest-endpoint-methods-5.8.0" (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.0" + sources."@octokit/rest-18.9.1" sources."@octokit/types-6.25.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { @@ -101472,7 +101709,7 @@ in sources."@types/http-proxy-1.17.7" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-1.1.2" + sources."@types/istanbul-reports-3.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" sources."@types/node-16.6.1" @@ -101481,10 +101718,10 @@ in sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" sources."@types/semver-7.3.8" - sources."@types/yargs-13.0.12" + sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.29.1" - (sources."@typescript-eslint/typescript-estree-4.29.1" // { + sources."@typescript-eslint/types-4.29.2" + (sources."@typescript-eslint/typescript-estree-4.29.2" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -101501,7 +101738,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.29.1" + sources."@typescript-eslint/visitor-keys-4.29.2" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -101515,18 +101752,22 @@ in (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."chalk-3.0.0" sources."get-stream-5.2.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" + sources."react-is-16.13.1" + sources."supports-color-7.2.0" ]; }) (sources."ansi-align-3.0.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" @@ -101534,7 +101775,7 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-5.2.0" sources."ansicolors-0.3.2" sources."any-observable-0.3.0" @@ -101548,7 +101789,6 @@ in (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."argparse-2.0.1" @@ -101598,7 +101838,6 @@ in (sources."boxen-5.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.0" sources."type-fest-0.20.2" sources."wrap-ansi-7.0.0" ]; @@ -101638,12 +101877,14 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" @@ -101695,7 +101936,6 @@ in sources."extract-stack-2.0.0" sources."has-flag-4.0.0" sources."js-yaml-3.14.1" - sources."supports-color-8.1.1" (sources."supports-hyperlinks-2.2.0" // { dependencies = [ sources."supports-color-7.2.0" @@ -101735,17 +101975,9 @@ in sources."dot-prop-5.3.0" ]; }) - (sources."content-disposition-0.5.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - (sources."convert-source-map-1.8.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."convert-source-map-1.8.0" sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -101754,10 +101986,9 @@ in sources."pump-1.0.3" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" - sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101806,7 +102037,6 @@ in sources."bl-1.2.3" sources."file-type-5.2.0" sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" ]; }) @@ -101905,7 +102135,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -101966,7 +102196,6 @@ in dependencies = [ sources."cookie-0.4.0" sources."debug-2.6.9" - sources."safe-buffer-5.1.2" ]; }) sources."express-logging-1.1.1" @@ -101995,7 +102224,6 @@ in sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.8" - sources."fast-stringify-1.1.2" sources."fastq-1.11.1" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" @@ -102008,14 +102236,15 @@ in }) sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" sources."cacheable-request-7.0.2" + sources."camelcase-5.3.1" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" sources."got-10.7.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" (sources."jest-validate-25.5.0" // { dependencies = [ @@ -102029,7 +102258,9 @@ in sources."normalize-url-6.1.0" sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" + sources."react-is-16.13.1" sources."responselike-2.0.0" + sources."supports-color-7.2.0" sources."type-fest-0.10.0" ]; }) @@ -102067,7 +102298,6 @@ in (sources."from2-2.3.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."from2-array-0.0.4" @@ -102096,7 +102326,11 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-cache-dir-2.0.0" - sources."global-dirs-2.1.0" + (sources."global-dirs-3.0.0" // { + dependencies = [ + sources."ini-2.0.0" + ]; + }) sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ @@ -102190,7 +102424,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.7" + sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -102235,11 +102469,11 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.3.2" + sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" sources."is-module-1.0.0" sources."is-natural-number-4.0.1" - sources."is-npm-4.0.0" + sources."is-npm-5.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -102267,18 +102501,14 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isurl-1.0.0" - sources."jest-get-type-24.9.0" - (sources."jest-validate-24.9.0" // { + sources."jest-get-type-26.3.0" + sources."jest-validate-26.6.2" + (sources."jest-worker-26.6.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."supports-color-5.5.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) - sources."jest-worker-26.6.2" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -102304,7 +102534,6 @@ in (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."leven-3.1.0" @@ -102346,12 +102575,7 @@ in sources."type-fest-0.3.1" ]; }) - (sources."locate-path-6.0.0" // { - dependencies = [ - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" @@ -102366,15 +102590,7 @@ in sources."lodash.templatesettings-4.2.0" sources."lodash.transform-4.6.0" sources."lodash.union-4.6.0" - (sources."log-process-errors-5.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."fast-equals-1.6.3" - sources."micro-memoize-2.1.2" - sources."moize-5.4.7" - ]; - }) + sources."log-process-errors-6.3.0" sources."log-symbols-4.1.0" (sources."log-update-2.3.0" // { dependencies = [ @@ -102439,21 +102655,12 @@ in sources."mkdirp-0.5.5" sources."module-definition-3.3.1" sources."moize-6.0.3" - (sources."move-file-1.2.0" // { - dependencies = [ - (sources."cp-file-6.2.0" // { - dependencies = [ - sources."make-dir-2.1.0" - ]; - }) - sources."path-exists-3.0.0" - sources."semver-5.7.1" - ]; - }) + sources."move-file-2.1.0" sources."ms-2.0.0" (sources."multiparty-4.2.2" // { dependencies = [ sources."http-errors-1.8.0" + sources."safe-buffer-5.2.1" sources."setprototypeof-1.2.0" ]; }) @@ -102468,12 +102675,8 @@ in sources."qs-6.10.1" ]; }) - sources."netlify-headers-parser-2.1.1" - (sources."netlify-redirect-parser-10.1.0" // { - dependencies = [ - sources."is-plain-obj-2.1.0" - ]; - }) + sources."netlify-headers-parser-3.0.1" + sources."netlify-redirect-parser-11.0.2" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" @@ -102482,26 +102685,32 @@ in (sources."node-version-alias-1.0.1" // { dependencies = [ sources."@jest/types-25.5.0" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."chalk-3.0.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" + sources."react-is-16.13.1" + sources."supports-color-7.2.0" ]; }) sources."noop2-2.0.0" (sources."normalize-node-version-10.0.0" // { dependencies = [ sources."@jest/types-25.5.0" - sources."@types/yargs-15.0.14" - sources."ansi-regex-5.0.0" + sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."chalk-3.0.0" + sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" sources."jest-validate-25.5.0" sources."pretty-format-25.5.0" + sources."react-is-16.13.1" + sources."supports-color-7.2.0" ]; }) (sources."normalize-package-data-2.5.0" // { @@ -102591,8 +102800,8 @@ in }) sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-reduce-2.1.0" sources."p-timeout-2.0.1" @@ -102610,7 +102819,6 @@ in (sources."parallel-transform-1.2.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."parse-github-url-1.0.2" @@ -102636,12 +102844,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - ]; - }) + sources."pkg-dir-5.0.0" sources."posix-character-classes-0.1.1" sources."postcss-8.3.6" sources."postcss-values-parser-2.0.1" @@ -102649,14 +102852,12 @@ in sources."precond-0.2.3" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - (sources."pretty-format-24.9.0" // { + (sources."pretty-format-26.6.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."ansi-styles-4.3.0" ]; }) - sources."pretty-ms-5.1.0" + sources."pretty-ms-7.0.1" sources."prettyjson-1.2.1" sources."printj-1.1.2" sources."process-es6-0.11.6" @@ -102678,7 +102879,7 @@ in ]; }) sources."rc-1.2.8" - sources."react-is-16.13.1" + sources."react-is-17.0.2" sources."read-package-json-fast-2.0.3" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -102689,6 +102890,8 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."type-fest-0.8.1" ]; }) @@ -102747,7 +102950,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -102875,16 +103078,8 @@ in sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.2" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."strip-ansi-6.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - ]; - }) + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" sources."strip-ansi-control-characters-2.0.0" sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" @@ -102896,7 +103091,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."supports-color-7.2.0" // { + (sources."supports-color-8.1.1" // { dependencies = [ sources."has-flag-4.0.0" ]; @@ -102920,7 +103115,6 @@ in sources."type-fest-0.16.0" ]; }) - sources."term-size-2.2.1" (sources."terser-5.7.1" // { dependencies = [ sources."source-map-0.7.3" @@ -102931,7 +103125,6 @@ in (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."through2-filter-3.0.0" @@ -102995,14 +103188,7 @@ in sources."has-values-0.1.4" ]; }) - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."global-dirs-3.0.0" - sources."ini-2.0.0" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" - ]; - }) + sources."update-notifier-5.1.0" sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" @@ -103044,7 +103230,6 @@ in (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" ]; }) sources."word-wrap-1.2.3" @@ -103063,9 +103248,15 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + ]; + }) + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" ]; }) - sources."yargs-parser-18.1.3" sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -104948,7 +105139,7 @@ in sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -105804,7 +105995,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -105915,7 +106106,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.805" + sources."electron-to-chromium-1.3.808" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -108673,10 +108864,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.161"; + version = "1.1.162"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.161.tgz"; - sha512 = "ahZ8KyDAMdyFTt9j0P/WL6SAeZWKI9qxoFRmTxw71JwyCVPSqXaeo2rK3304YjfKZKAtuHNMgtuZiAVT8U/Pbw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.162.tgz"; + sha512 = "3YEM8rf/39CtuHMzZmVjsV/2cJJB6N3RfCuNR5QgUeib0VRQ303zhb4jh5RRRF9P6JpZku/waX+i16TrfSqDEQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -109434,7 +109625,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.1" // { + (sources."core-js-compat-3.16.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -109578,7 +109769,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110921,7 +111112,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.1.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -111246,7 +111437,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.1.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -111472,7 +111663,7 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.702"; + version = "0.2.710"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -111488,35 +111679,27 @@ in sources."ignore-4.0.6" ]; }) + sources."@hpcc-js/wasm-1.4.1" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@rollup/plugin-commonjs-17.1.0" - sources."@rollup/plugin-node-resolve-13.0.4" - (sources."@rollup/pluginutils-3.1.0" // { - dependencies = [ - sources."estree-walker-1.0.1" - ]; - }) sources."@tootallnate/once-1.1.2" - sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" sources."@types/node-14.17.9" sources."@types/node-fetch-2.5.12" - sources."@types/resolve-1.17.1" sources."@types/vscode-1.59.0" - sources."@typescript-eslint/eslint-plugin-4.29.1" - sources."@typescript-eslint/experimental-utils-4.29.1" - sources."@typescript-eslint/parser-4.29.1" - sources."@typescript-eslint/scope-manager-4.29.1" - sources."@typescript-eslint/types-4.29.1" - sources."@typescript-eslint/typescript-estree-4.29.1" - sources."@typescript-eslint/visitor-keys-4.29.1" + sources."@typescript-eslint/eslint-plugin-4.29.2" + sources."@typescript-eslint/experimental-utils-4.29.2" + sources."@typescript-eslint/parser-4.29.2" + sources."@typescript-eslint/scope-manager-4.29.2" + sources."@typescript-eslint/types-4.29.2" + sources."@typescript-eslint/typescript-estree-4.29.2" + sources."@typescript-eslint/visitor-keys-4.29.2" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -111543,7 +111726,6 @@ in sources."buffer-crc32-0.2.13" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."builtin-modules-3.2.0" sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.2.0" @@ -111564,18 +111746,63 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-7.2.0" sources."commandpost-1.4.0" - sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."css-select-4.1.3" sources."css-what-5.0.1" + sources."d3-7.0.1" + sources."d3-array-3.0.2" + sources."d3-axis-3.0.0" + sources."d3-brush-3.0.0" + sources."d3-chord-3.0.1" + sources."d3-color-3.0.1" + sources."d3-contour-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-drag-3.0.0" + sources."d3-dsv-3.0.1" + sources."d3-ease-3.0.1" + sources."d3-fetch-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.0.1" + sources."d3-geo-3.0.1" + (sources."d3-graphviz-4.0.0" // { + dependencies = [ + sources."d3-color-2.0.0" + sources."d3-dispatch-2.0.0" + sources."d3-drag-2.0.0" + sources."d3-ease-2.0.0" + sources."d3-format-2.0.0" + sources."d3-interpolate-2.0.1" + sources."d3-path-2.0.0" + sources."d3-selection-2.0.0" + sources."d3-timer-2.0.0" + sources."d3-transition-2.0.0" + sources."d3-zoom-2.0.0" + ]; + }) + sources."d3-hierarchy-3.0.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-polygon-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-random-3.0.1" + sources."d3-scale-4.0.0" + sources."d3-scale-chromatic-3.0.0" + sources."d3-selection-3.0.0" + sources."d3-shape-3.0.1" + sources."d3-time-3.0.0" + sources."d3-time-format-4.0.0" + sources."d3-timer-3.0.1" + sources."d3-transition-3.0.1" + sources."d3-zoom-3.0.0" sources."debug-4.3.2" sources."decamelize-4.0.0" sources."deep-is-0.1.3" - sources."deepmerge-4.2.2" + sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" sources."diff-5.0.0" @@ -111588,6 +111815,7 @@ in sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ + sources."commander-2.20.3" sources."lru-cache-4.1.5" sources."semver-5.7.1" sources."yallist-2.1.2" @@ -111628,7 +111856,6 @@ in ]; }) sources."estraverse-4.3.0" - sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" @@ -111667,20 +111894,19 @@ in sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.6.3" sources."ignore-5.1.8" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internmap-2.0.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-module-1.0.0" sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" - sources."is-reference-1.2.1" sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -111699,7 +111925,6 @@ in sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" - sources."magic-string-0.25.7" (sources."markdown-it-10.0.0" // { dependencies = [ sources."entities-2.0.3" @@ -111754,7 +111979,6 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.0" @@ -111776,13 +112000,14 @@ in sources."regexpp-3.2.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.51.1" + sources."robust-predicates-3.0.1" sources."run-parallel-1.2.0" + sources."rw-1.3.3" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."serialize-javascript-6.0.0" sources."setimmediate-1.0.5" @@ -111798,7 +112023,6 @@ in sources."color-name-1.1.4" ]; }) - sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" sources."string-width-4.2.2" (sources."string_decoder-1.1.1" // { @@ -111985,10 +112209,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.37.5"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz"; - sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz"; + sha512 = "WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -112236,7 +112460,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.6.0" // { + (sources."@serverless/utils-5.7.0" // { dependencies = [ sources."get-stream-6.0.1" sources."write-file-atomic-3.0.3" @@ -112314,7 +112538,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.969.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -112859,7 +113083,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.43.0" // { + (sources."simple-git-2.44.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -113669,14 +113893,15 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.681.0"; + version = "1.683.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.681.0.tgz"; - sha512 = "SzzCytuUzKfTLd54cQw1FN8j/iRmucJ+IsVpVJlHwCUgXxKi1M80d5vaVXsfCWk42L0Gvh4I/YkllJC8QQXqig=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.683.0.tgz"; + sha512 = "cvdSuSuHyb7ijF68afG/Nbxm4wxnPQQCMjB0SYqTln+W7tMY8wLUr86QaQZIBN2Umb7zgY40gBRDq2R2nYVZGQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" sources."@deepcode/dcignore-1.0.2" + sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -113685,7 +113910,7 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.10.1" + sources."@snyk/cloud-config-parser-1.10.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" (sources."@snyk/code-client-4.0.0" // { dependencies = [ @@ -113870,7 +114095,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -114200,7 +114425,7 @@ in sources."p-map-2.1.0" ]; }) - (sources."snyk-nuget-plugin-1.22.0" // { + (sources."snyk-nuget-plugin-1.22.1" // { dependencies = [ sources."jszip-3.7.0" sources."pako-1.0.11" @@ -114215,7 +114440,7 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-poetry-lockfile-parser-1.1.6" // { + (sources."snyk-poetry-lockfile-parser-1.1.7" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -114224,11 +114449,11 @@ in dependencies = [ sources."lru-cache-5.1.1" sources."semver-7.3.5" - sources."snyk-try-require-2.0.1" + sources."snyk-try-require-2.0.2" sources."yallist-3.1.1" ]; }) - (sources."snyk-python-plugin-1.19.11" // { + (sources."snyk-python-plugin-1.20.1" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -115566,7 +115791,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.968.0" // { + (sources."aws-sdk-2.969.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -116443,7 +116668,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -118994,7 +119219,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -119802,10 +120027,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.0.tgz"; - sha512 = "gBvRnenOM413yVfZy8dKMs+b+/Zknl2o1M79+XAGbdptOds+VAkbZXrfj0MC1IGdB+hQ6XxuWa4jWfrvBkoFiQ=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.1.tgz"; + sha512 = "ZqqD4XK1EgITEoW1SaOnNe473K5EMr7vSYwFeqK4Fe37TjNyEwB+2vXuqW01kPujiw7tRpv3teDAl7WtP9AmIw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -121007,7 +121232,7 @@ in sources."jsonc-parser-3.0.0" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.6" // { + (sources."vscode-json-languageservice-4.1.7" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -121105,7 +121330,7 @@ in sources."typescript-4.3.5" sources."vscode-css-languageservice-5.1.4" sources."vscode-html-languageservice-4.0.7" - sources."vscode-json-languageservice-4.1.6" + sources."vscode-json-languageservice-4.1.7" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" @@ -121157,7 +121382,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@webpack-cli/configtest-1.0.4" sources."@webpack-cli/info-1.3.0" - sources."@webpack-cli/serve-1.5.1" + sources."@webpack-cli/serve-1.5.2" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.4.1" @@ -121222,7 +121447,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -121432,7 +121657,7 @@ in sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" sources."webpack-5.50.0" - (sources."webpack-cli-4.7.2" // { + (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" ]; @@ -122740,7 +122965,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) sources."brace-expansion-1.1.11" @@ -122763,7 +122988,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.16.1" + sources."core-js-pure-3.16.2" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -122927,10 +123152,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-6.2.0.tgz"; - sha512 = "vibPf31/5NajygV85b6PSki2gZwOK0lQYfC2q30VdEHeS1d4hJU39mnDXM0D2nM6t7REYR8xRNgmTiDcsHCS8A=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-6.3.0.tgz"; + sha512 = "yMpSFUN6396oMs09zN+gqYM8gozfz932gduLdRCtspt16qt33c8p+7crGkHkAQmLRloMn2c4I/1RKgMq02Vnhg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -122953,10 +123178,19 @@ in (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."debug-4.3.2" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" sources."ms-2.1.2" ]; }) - sources."@mdn/browser-compat-data-3.3.7" + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.0" + sources."@mdn/browser-compat-data-3.3.14" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" @@ -122964,12 +123198,12 @@ in sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" - (sources."addons-linter-3.8.0" // { + (sources."addons-linter-3.12.0" // { dependencies = [ - sources."yargs-17.0.1" + sources."yargs-17.1.0" ]; }) - sources."addons-scanner-utils-4.8.0" + sources."addons-scanner-utils-4.9.0" sources."adm-zip-0.5.5" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" @@ -123021,7 +123255,7 @@ in sources."callsites-3.1.0" sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" sources."chrome-launcher-0.14.0" @@ -123045,7 +123279,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-5.0.1" - sources."core-js-3.12.0" + sources."core-js-3.16.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" @@ -123068,6 +123302,7 @@ in (sources."dispensary-0.62.0" // { dependencies = [ sources."async-3.2.1" + sources."pino-6.11.3" ]; }) sources."doctrine-3.0.0" @@ -123086,14 +123321,20 @@ in sources."entities-2.2.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" - sources."es6-promisify-6.1.1" + sources."es6-promisify-7.0.0" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.28.0" // { + (sources."eslint-7.32.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.2" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; @@ -123105,10 +123346,10 @@ in sources."eslint-visitor-keys-1.3.0" ]; }) - sources."eslint-visitor-keys-2.1.0" - (sources."espree-7.3.1" // { + sources."eslint-visitor-keys-3.0.0" + (sources."espree-8.0.0" // { dependencies = [ - sources."eslint-visitor-keys-1.3.0" + sources."acorn-8.4.1" ]; }) sources."esprima-4.0.1" @@ -123343,9 +123584,9 @@ in sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.11.3" + sources."pino-6.13.0" sources."pino-std-serializers-3.2.0" - sources."postcss-8.3.4" + sources."postcss-8.3.6" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -123406,7 +123647,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - sources."sign-addon-3.5.0" + sources."sign-addon-3.7.0" sources."signal-exit-3.0.3" sources."slice-ansi-4.0.0" sources."sonic-boom-1.4.1" @@ -123552,7 +123793,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.3.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.805" + sources."electron-to-chromium-1.3.808" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -123612,16 +123853,16 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.7.2"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; - sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" sources."@webpack-cli/configtest-1.0.4" sources."@webpack-cli/info-1.3.0" - sources."@webpack-cli/serve-1.5.1" + sources."@webpack-cli/serve-1.5.2" sources."clone-deep-4.0.1" sources."colorette-1.3.0" sources."commander-7.2.0" @@ -124635,7 +124876,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.3.9" // { + (sources."webtorrent-1.3.10" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -124652,7 +124893,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.1.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -124730,7 +124971,7 @@ in sources."jsonc-parser-3.0.0" sources."ms-2.0.0" sources."request-light-0.2.5" - (sources."vscode-json-languageservice-4.1.6" // { + (sources."vscode-json-languageservice-4.1.7" // { dependencies = [ sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" @@ -124814,7 +125055,7 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/package-json-1.0.1" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.5" + sources."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.7.0" sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" @@ -124935,7 +125176,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.16.1" + sources."core-js-3.16.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -125700,10 +125941,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-2.1.0.tgz"; - sha512 = "7mCJ92ev894l94w5aXkdQoZ9iE6qXERLMPp/uMhTumGKtyhvN8tWprqFFHiXGS/31HxEy1NtNd9NHmYjGHd85A=="; + url = "https://registry.npmjs.org/zx/-/zx-3.0.0.tgz"; + sha512 = "GPaKTImhbKfc3TmJ43g8vRT6PMhiifcUZ0ndhHqhqtJMbteTQYNzTZT+vBtdZsDMkoqxE54Vjm3bDsplE2qWFg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -125729,7 +125970,7 @@ in sources."form-data-3.0.1" sources."fs-extra-10.0.0" sources."glob-parent-5.1.2" - sources."globby-12.0.0" + sources."globby-12.0.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."ignore-5.1.8" diff --git a/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch b/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch new file mode 100644 index 000000000000..a8aac88de319 --- /dev/null +++ b/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch @@ -0,0 +1,13 @@ +From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont + +--- a/src/modules/perl/modperl_perl.c ++++ a/src/modules/perl/modperl_perl.c +@@ -268,7 +268,7 @@ + #ifdef MP_NEED_HASH_SEED_FIXUP + if (MP_init_hash_seed_set) { + #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) +- memcpy(&PL_hash_seed, &MP_init_hash_seed, ++ memcpy(PL_hash_seed, &MP_init_hash_seed, + sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? + sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); + PL_hash_seed_set = MP_init_hash_seed_set; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 267ca5b4a5a6..e728c7dc7c5f 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.8.2"; + version = "0.9.1"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho="; + sha256 = "sha256-+BmymfRKwNPlksYcAUb/5cZYeOD5h85YhobmsNFJVE8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index 78d9ef43501e..859fd0dc5c1a 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; - rev = "v${version}"; - sha256 = "09zbca84dn1sprwqpfanmxxnmaknbzjz98xa87agpgy8xb3wpw7j"; + rev = "v.${version}"; + sha256 = "04qdjyxq35063jpn218vw94a4r19fknk1q2kkxr8gnaabkpkjrnf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 04a3e11be3ef..1aa9dc2b1027 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yKzpyJHUIkVYVwrL6oCPMd+QSVML2czWmQHCemXWAMQ="; + sha256 = "sha256-Q7iZD9GG8vPxITpn87l3yGtU+L8jwvs2Qi329LHlKrI="; }; nativeBuildInputs = [ Babel installShellFiles ]; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index bc88fece7710..611508b42450 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.3.1"; + version = "7.3.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dc162fc572087cdf53065a2ea9517b002a6702cf382f998d69903d68c16c731e"; + sha256 = "6c9bef0bfb4ac2bb8158fdfb3938884cd42542be3162ac288fa8df4e254d3810"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index aee7147f5b49..e3ee7b9ba73b 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.7.2"; + version = "1.8.0"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "12398831a3a3a2ed7c67e693cf596610c23dd23e0889bfeae0830bbd1d41e5b9"; + sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777"; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 127e6f929338..8ed07d9597b1 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.2.0"; + version = "0.2.1"; disabled = pythonOlder "3.6"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = version; - sha256 = "sha256-Kuc7g5+4TIcQTWYjG4uPN0Rxfom/A/xpek5K5ErlbdU="; + sha256 = "sha256-RDb4Dc+igt2JKskBFIFvYt4xTAMujp8uXnkWsgnwdJE="; }; propagatedBuildInputs = [ pysha3 setuptools ]; diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 29ddb16f27f7..ee6e1db06aca 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , stdenv , packaging @@ -10,12 +10,14 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.3.0"; + version = "3.3.1"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ROSZorkA2wAp2Ubh3B3KWIUxM/4r7cv/1aSJqeKnPqg="; + src = fetchFromGitHub { + owner = "SamSchott"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-GbsbwCKRTgLk0xK6MGKb1Tp6cd8q3h6OUdJ2f+VPyzk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index c2a7df098f4b..9ffb57963991 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12"; + sha256 = "380b660474be40ce88b5f04fa93470449124dbc850a0318f2ef186162bc1360b"; }; buildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix index 04d9da87c5c1..8d104a889a01 100644 --- a/pkgs/development/python-modules/fastecdsa/default.nix +++ b/pkgs/development/python-modules/fastecdsa/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "fastecdsa"; - version = "2.1.5"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa"; + sha256 = "48d59fcd18d0892a6b76463d4c98caa217975414f6d853af7cfcbbb0284cb52d"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index f8468209bb45..885c688225ca 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "flowlogs_reader"; - version = "2.4.0"; + version = "3.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4"; + sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4"; }; propagatedBuildInputs = [ botocore boto3 docutils ]; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix new file mode 100644 index 000000000000..e51661237809 --- /dev/null +++ b/pkgs/development/python-modules/furo/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, sphinx +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "furo"; + version = "2021.8.11b42"; + format = "flit"; + disable = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-rhi2T57EfidQV1IHBkplCbzLlBCC5gVGmbkCf40s0qU="; + }; + + propagatedBuildInputs = [ + sphinx + beautifulsoup4 + ]; + + pythonImportsCheck = [ "furo" ]; + + meta = with lib; { + description = "A clean customizable documentation theme for Sphinx"; + homepage = "https://github.com/pradyunsg/furo"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 8dc87ffa8860..a059495d00fe 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6045b22dfbd8aec5542fe15d71684e46df0a4de852ccae6a02c9db3a24076e01"; + sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1"; }; propagatedBuildInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2d0af0717b1d..2fd9247c8825 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.9.0"; + version = "2.15.0"; src = fetchPypi { inherit pname version; - sha256 = "2b5274f06799d80222fd3f20fd4ebcd19f57c009703bd4cf7b00492e7e05e15a"; + sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo="; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 6e4c139d8dd0..940d04e5a413 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CYMsbnUDL5OBjt8a/+R0YSHWQMYlpb75tclq9nbpju4="; + sha256 = "sha256-SrWObD3GzPES+SH8ztQOVCb7omZ2iYbqUCIoSIJ26ro="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 1a39296d629c..bfca445a961f 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.31.0"; + version = "1.34.0"; src = fetchPypi { inherit pname version; - sha256 = "154f7889c5d679a6f626f36adb12afbd4dbb0a9a04ec575d989d6ba79c4fd65e"; + sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 556bc09ed6e5..27e79bdd060d 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , mock , proto-plus , pytest-asyncio @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "0.1.0"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw"; + sha256 = "sha256-1E+3fXcGsIbTh7nXnBOcVT1UtY3cjulnu/MqU+e77lY="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 61e69c5b29da..437417323fcc 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , google-cloud-access-context-manager , google-cloud-org-policy @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "2.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "05q0yaw6b553qmzylr45zin17h8mvi8yyyxhbv3cxa7f0ahviw8w"; + sha256 = "sha256-/iTpO1Y+v//ZzaXUpOfBOXDRfftpmUV4hxsFmMj3tM0="; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - grpc_google_iam_v1 + grpc-google-iam-v1 google-api-core google-cloud-access-context-manager google-cloud-org-policy diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 1d40dcac268e..f7a567357310 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.3.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "523633496b4fe1ca74a7b22cdaa206581804863813bf461e2f437d0fb7ad21b6"; + sha256 = "sha256-c3zlpCejXB/RO8RnyFUpDknefpoMZWXWgaS7ACpqdAw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index ec3be9e2ab00..f6a62c544cf4 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.1.1"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "9ac8cd06a60bfdc504f39fbcd086e5180c8684cffefe7745a9ff6a639c575629"; + sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 566c566bbe48..3d18612d101b 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , mock , proto-plus , pytest-asyncio @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "0.1.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj"; + sha256 = "sha256-5ixj9MnJVVcU9NR4ZBe0TAp8ogJLAKrPlyGm5d/iQwA="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index acb66394bd4a..0bd663b4f151 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , freezegun , google-cloud-core +, google-cloud-datacatalog , google-cloud-storage , google-cloud-testutils , google-resumable-media @@ -17,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.20.0"; + version = "2.23.3"; src = fetchPypi { inherit pname version; - sha256 = "ff728f9a4a64d6b4ec5beb7fd2f6ed550b49bfe2b8bb3755c00821716e0d1f91"; + sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; }; propagatedBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { mock pandas psutil + google-cloud-datacatalog google-cloud-storage pytestCheckHook ]; @@ -53,6 +55,12 @@ buildPythonPackage rec { "TestBigQuery" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" + # requires network + "test_dbapi_create_view" + "test_list_rows_nullable_scalars_dtypes" + "test_parameterized_types_round_trip" + "test_structs" + "test_table_snapshots" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index f7eb9a51a8a3..5f61ac7f8830 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -3,7 +3,7 @@ , fetchPypi , google-api-core , google-cloud-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.2.0"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU="; + sha256 = "sha256-4rMnGnDQtuu55mzrYkeJjrU0ykQXd+pOYAw2yVcqJAQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core - grpc_google_iam_v1 + grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 095e0a84479e..fccae98ac064 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.4.1"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e7d93ca399dd6fb5fd0f99190248531c9c583d1a85e7cd2c9ee485495459ee78"; + sha256 = "sha256-nMUMGFU383TC7cXkj6EHaEe4HHS5NzcLBIxp1xgWUzg="; }; - propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 3e9a3d1851b0..b9edb4224d8c 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.7.0"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "2ab0cf260c11d0cc334573301970419abb6a1f3909c6cd136e4be996616372fe"; + sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix new file mode 100644 index 000000000000..669d06b305d7 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }: + +buildPythonPackage rec { + pname = "google-cloud-datacatalog"; + version = "3.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2faca51e974c46203c09fd4cb2c03fd6e82cd572cc06a2bbc3b401aa419cb09f"; + }; + + propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; + + checkInputs = [ pytest-asyncio pytestCheckHook mock ]; + + pythonImportsCheck = [ "google.cloud.datacatalog" ]; + + meta = with lib; { + description = "Google Cloud Data Catalog API API client library"; + homepage = "https://github.com/googleapis/python-datacatalog"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index e98c8be0b4f9..718c5998a34e 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6e5373febe420e2b2375d2252b272129f11a37ff1b88a7587322931063be8d38"; + sha256 = "sha256-wRGIuut2mJ6RJh8fRUAT0JDmnUreQYXhgVgsfRxvyxo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 5ffeac605e52..f1449bbccd0a 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.1.3"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "e7a510759b9d55ff63c983e3c42cbf5c35f9b7310f4d611ebe3697da6576bcb4"; + sha256 = "sha256-31PBHWnU0KbX8ymFh7+dP0uVbM6BWexdaumMVQbBO6o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index ea5d20142d59..a433ccdc69c9 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.1.1"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0863e90f9a9cae70af7962dd17d99cb6dde44bf3a029ce5990cb8226557a9e95"; + sha256 = "sha256-ZxGWTsqCIvpTSN+aThVgjPuMJE7hHMVn4zsidpXk7xk="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 94576499b985..be463f6a9633 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.32.3"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "bbb1c855524bd3f0f2a3b3db883af0d3f618befb976aa694d7e507dd68fc7a71"; + sha256 = "sha256-iPAJMzxefRjLA0tGUfjAs15ZJvcyBUJB1QCMfMBo96I="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 8aae0c072a0f..28d2d538e075 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.1.2"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NT/+2mtIaEMyXnmM1fWX4kEV9pb1+aNas2lNobUPR14="; + sha256 = "sha256-LKESEpQLvjmyo8VcZ1fxMcPCbUE+mxvmnexoZEKramc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 1c2dfe88a6eb..87bd997ae88f 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.1.3"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "143a88ef2b90c98f16d2b0bc192631ca3e2b7c66a236d93ba9961de64e50870e"; + sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 55d36ac2a7c7..9e5dd9fa214a 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , mock , proto-plus , pytest-asyncio @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "0.1.0"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "19a8s634w2m1b16zq8f185cpaw7k6d0c7c61g1vzm19jl213rhiw"; + sha256 = "sha256-yX58Pq2+YB3ylN92RUIGlQKnvKYD7sabCKtZsDNV5sc="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 5fc87b31c306..f3a56429273b 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , libcst , proto-plus @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "f4d7c55636e8cb57a4dde41d933cd8663b1369ab3542b287957959ee59828559"; + sha256 = "sha256-vMzq4ffA7877zRtdZ+VpFdEHU0BZhDdhgxuk5154hMU="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 1caf22bdd27a..9992dc7bc76f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , libcst , mock @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.3.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "39c6aa1633e45dc0364397b24c83718bd63f833db41d8c93b76019c16208d0f1"; + sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index b6414355a19d..140f5be3cf77 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.1.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "63ca2d772e16e4440858848e8c3298859b931b1652f663683fb5d7413b7c9a1b"; + sha256 = "sha256-X8lh+90HyyktxgJiRaiJF9ExKHmgiVcQiYDotg3AqaQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 6e11f78347a2..00abd8160690 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ab9d6ee1156cabe8c2483ca5a67bdf3a8582c596dd4e498a59781b6670b085f0"; + sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 2638a4bda8d5..c2a08fd7bee5 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.3.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "fcbf644622709277d47b0dd8884efd1d62703bffda3c1030e06404709690c06c"; + sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 766ed903767f..d86a40d57b6a 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.2.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "2b828513c1cea481d03d0218516e5c5d8b53756db3637f02cd69ae3c171832dc"; + sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index f0615bd5a21b..47af89d4be27 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -4,7 +4,7 @@ , pytestCheckHook , google-api-core , google-cloud-testutils -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.5.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8706557b71532c76aec48409dcac189caac47cf2decb8850ae75694bf70326b2"; + sha256 = "sha256-F4itJadl6oNJnY9EENTIugJll8uC20bS9yF/HCUlrWU="; }; propagatedBuildInputs = [ - grpc_google_iam_v1 + grpc-google-iam-v1 google-api-core libcst proto-plus diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index fe4ea4249c02..e149f031b9d2 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.1.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d97fde9361026ab67f53557a8fe9f3db26121959ab586fe453f42a401d40fb4c"; + sha256 = "sha256-lxjxkBK/7up+t2dF2hZz3QXeXLwo9L0Z78mH6aC4Icc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 8a265182fba4..8e7953384eaa 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -4,19 +4,21 @@ , pytestCheckHook , google-cloud-core , google-api-core +, grpc-google-iam-v1 +, proto-plus , mock }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.3"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm"; + sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core ]; + propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; checkInputs = [ mock pytestCheckHook ]; @@ -25,7 +27,10 @@ buildPythonPackage rec { rm -r google ''; - pythonImportsCheck = [ "google.cloud.resource_manager" ]; + pythonImportsCheck = [ + "google.cloud.resourcemanager" + "google.cloud.resourcemanager_v3" + ]; meta = with lib; { description = "Google Cloud Resource Manager API client library"; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 6e741a4e2974..89c6cb7592e6 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.2"; + version = "0.32.3"; src = fetchPypi { inherit pname version; - sha256 = "5285aef98fdb9a691e7c54789e7c493c51674b6e77fe6c967172ae8eadbba026"; + sha256 = "sha256-un5WZ2rxVXPKj9CPfhrojlA9ml6wfPIu0JD6p8WCY/A="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index cf1ac538f159..30174afcbb05 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.5.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "e99eb9f77373b97bfc1becb7d23fae5574a33fd9e44b44a3e700abcbfbc9f94d"; + sha256 = "sha256-gfNoCfh2ssHgYcQ1kfQedcfhpqsu3x50hdYrm11SKGo="; }; propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index cc83868079f2..79fe9221d187 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-api-core , libcst , mock @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.3.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "872507adad97f452e0998730cd1993c0433c05a0757c268f5c02fbfabe7720d4"; + sha256 = "sha256-DrdzC7Oe/8cq41OLcN51Qm208L0zPa9cxscHqmYji04="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 17fe6be97176..5f03a181183b 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 +, grpc-google-iam-v1 , google-cloud-core , google-cloud-testutils , libcst @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.5.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "19656140f180aef84e023c3a8fd534ac964247a52199317ea33abc701d5a8c5a"; + sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; }; propagatedBuildInputs = [ google-cloud-core - grpc_google_iam_v1 + grpc-google-iam-v1 libcst proto-plus sqlparse diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 8a72a3e006cf..2fab8b995e8c 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.4.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "991ee0601bc956110e873aee1a74441d66227b10cd581195575435884384f38b"; + sha256 = "sha256-NkUgRYoli/ngoyJmuF9/va7Ao5ouw3cxsbwCrSIaOQc="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 037e96c0e735..31d426907f98 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.38.0"; + version = "1.41.1"; src = fetchPypi { inherit pname version; - sha256 = "162011d66f64b8dc5d7936609a5daf0066cc521231546aea02c126a5559446c4"; + sha256 = "sha256-qB7MDzgrjkQ3zH8VL3TXfvkXyCgKXRBA9dz70FAseQY="; }; propagatedBuildInputs = [ @@ -42,12 +42,18 @@ buildPythonPackage rec { "post" "test_build_api_url" "test_ctor_mtls" + "test_hmac_key_crud" + "test_list_buckets" "test_open" + "test_anonymous_client_access_to_public_bucket" ]; - pytestFlagsArray = [ - "--ignore=tests/unit/test_bucket.py" - "--ignore=tests/system/test_system.py" + disabledTestPaths = [ + "tests/unit/test_bucket.py" + "tests/system/test_blob.py" + "tests/system/test_bucket.py" + "tests/system/test_fileio.py" + "tests/system/test_kms_integration.py" ]; # prevent google directory from shadowing google imports diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 420aacb1e4b9..db74ce39812a 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc_google_iam_v1 +, grpc-google-iam-v1 , libcst , mock , proto-plus @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.3.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "7cc24d389073c40af41e2fc091417dec6e58af07db9b1295853fc3d545c80cfe"; + sha256 = "sha256-4QOKG7Forf3x5l1XQbbX4A8upIxe+eCiwhPily26du4="; }; - propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index cf8bb20e61e9..05a66406ce02 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a23be7cc23bccb1ae6debb74a47dc5b51858b6322fcf034ca92fe7a4acb896f3"; + sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs="; }; propagatedBuildInputs = [ click google-auth six ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 44055e84ce68..b2af89fff50b 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.4.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "c50cc21b5df88b696680d8aac3ab6c86820c0e4d071d6a5dcd9b634a456cf59f"; + sha256 = "sha256-LcX7qSGMBMU72ZTNBLKaDd+M/2En+mc7/IZsZg2dF9I="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 3e96e06c8a0c..4201506871e1 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.2.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "3683477a5d747451332a38d6c8cea652b5991db1f6e4c39907fa3679708ac218"; + sha256 = "sha256-N2Y/DZXyxMSw+S/s58iJvrK/p2FM/B5O467Pctr+tdQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 3469043cdad4..f750e7bd54ef 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.2.0"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "8cd957f4b29a8c7a983e0a427c2712533c41bb7007b76a8cc88d6c65075c679a"; + sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 4240a4aa2e0f..ed719f0de1ab 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.2.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "08106ddeec90a27f4bc706f7267ec1c52f2bff745bafd4710bc6898460c8e9a6"; + sha256 = "sha256-+2HwsRZM/h2eVmX6uVEb1s9etDggoGuQg3qj7hXj/AQ="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 96360d8dc4e4..fe5860dc2b01 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.3.2"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "65ed06725377670fc1b21d474237922f29674d0f99a472b0c84683aa02af70a4"; + sha256 = "sha256-BZiBSH2nZ2tnHi6K1+Ii5i/ZrGJyyH1+6hurmqVfYcM="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index a5e462b64ad7..cbe06a72269f 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "632ac3c50eee704ed2a6e87d5a09379589841cf53459813c76f8bea01e77c49d"; + sha256 = "sha256-oq7AMZ1so8IR7nn8fIhUr4oOJEJp1FQPxiJIh+1bMLA="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 77346282cd7d..83b192522f37 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1a1eb743d13f782d1405437c266b2c815ef13c2b141ba40835c74a3317539d01"; + sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 938a472eddf1..58b50f5f84f8 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.4.5"; + version = "4.5.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "v${version}"; - sha256 = "sha256-Rdfp98UqTMbqcOpkzh0Dz8fNSSbuvCnCztCkxiBgaAA="; + sha256 = "1yfsfspvjngrb1lwaq04ahm94j9y2dwzdf4dsg3yl1c8w0vgf9yw"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 64c6e7bf2b1b..02c8bce05a27 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "1vgb92axlz1kkszmamjbsqgi74afnbr2mc1np3pmbn3bx5rmk1d9"; + sha256 = "sha256-0i7pMJ4gAVOkvj2uYZJygr3rehgIAfyxq9cWbozwRIQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix similarity index 71% rename from pkgs/development/python-modules/grpc_google_iam_v1/default.nix rename to pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 9a74206f02e0..1be825227e8d 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -3,7 +3,6 @@ , fetchPypi , grpcio , googleapis-common-protos -, pytest }: buildPythonPackage rec { @@ -17,15 +16,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpcio googleapis-common-protos ]; - # non-standard test format, and python3 will load local google folder first - # but tests cannot be ran if google folder is removed or moved + # no tests run doCheck = false; - checkInputs = [ pytest ]; + + pythonImportsCheck = [ + "google.iam" + "google.iam.v1" + ]; meta = with lib; { description = "GRPC library for the google-iam-v1 service"; homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 4baf8600ac76..42cf477ca160 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "locationsharinglib"; - version = "4.1.6"; - disabled = pythonOlder "3.6"; + version = "4.1.8"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "092j8z01nwjqh5zr7aj8mxl1zjd3j2irhrs39dhn47bd6db2a6ij"; + sha256 = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; }; propagatedBuildInputs = [ @@ -39,6 +39,8 @@ buildPythonPackage rec { # Tests requirements want to pull in multiple modules which we don't need substituteInPlace setup.py \ --replace "tests_require=test_requirements" "tests_require=[]" + substituteInPlace requirements.txt \ + --replace "coloredlogs>=15.0.1" "coloredlogs" ''; checkPhase = '' diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 0cb853abf2de..9f752626e5e9 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.13.0"; + version = "2.14.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-dklyxgaT3GaLqOhuspZU7DFEUBMQ9xmHQqdnvsOFo3g="; + sha256 = "sha256-I4butM9mM3EsfMnt6DaE1TyMr8prWfecc4CYtRxtIGw="; }; patches = [ diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 3fa782cb471b..df97d1c4d780 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.18.1"; + version = "1.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cfc45474c7eda0fe3c4b9eca2542124f2a0ff5543242bec61e8d08bce0f5bd48"; + sha256 = "sha256-zmaVzoBDg61vOSxLsYdMMjiWKQofZWVg3jZBa6gy2R4="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 3ed34b4e73d7..97187abd7591 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -42,5 +42,8 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/pybids"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; + # Doesn't support sqlalchemy >=1.4 + # See https://github.com/bids-standard/pybids/issues/680 + broken = true; }; } diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 323b58e82574..ebd0dc2aeb03 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.8.9"; + version = "0.1.9.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-ZjHDha7hSRXy86wm61bMMF8zMi5Lux6RbD0yFD/78J4="; + sha256 = "sha256-KsdJC09KugvAgkRZ5H5zrIJ5hC5Vt4QwGWML8kNnR7Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix index 304c22b07855..711392b4a30f 100644 --- a/pkgs/development/python-modules/pymeteireann/default.nix +++ b/pkgs/development/python-modules/pymeteireann/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pymeteireann"; - version = "0.3"; + version = "2021.8.0"; src = fetchFromGitHub { owner = "DylanGore"; repo = "PyMetEireann"; rev = version; - sha256 = "sha256-Y0qB5RZykuBk/PNtxikxjsv672NhS6yJWJeSdAe/MoU="; + sha256 = "1xcfb3f2a2q99i8anpdzq8s743jgkk2a3rpar48b2dhs7l15rbsd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 9fffbab03848..917eac02c5f9 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.0"; + version = "3.1.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "0nrsivgd3andlq9c0p72x06mz1s4ihhibbphccrm5v1fmbzj09zp"; + sha256 = "sha256-DvwnbZa1/Y08rrxdXgffkjaGAVdRkPmYCD+Xkv0h7OE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index 6da76a5cdba5..37a40f867bda 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -2,7 +2,6 @@ , appdirs , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pyee , pytest-xdist @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "pyppeteer"; - version = "0.2.5"; + version = "0.2.6"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1hl4rw8j5yiak0d34vx1l1blr8125bscjd8m46a5m8xzm98csjc7"; + sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4="; }; nativeBuildInputs = [ @@ -45,21 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/pyppeteer/pyppeteer/pull/262 - (fetchpatch { - name = "switch-poetry-core.patch"; - url = "https://github.com/pyppeteer/pyppeteer/commit/e248baebefcf262fd96f261d940e74ed49ba2df9.patch"; - sha256 = "03g8n35kn2alqki37s0hf2231fk2zkr4nr1x1g2rfrhps9d6fyvw"; - }) - ]; - - postPatch = '' - # https://github.com/pyppeteer/pyppeteer/pull/252 - substituteInPlace pyproject.toml \ - --replace 'websockets = "^8.1"' 'websockets = "*"' - ''; - disabledTestPaths = [ # Requires network access "tests/test_browser.py" diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index f5586c69bd43..ed7a83bdae81 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.6"; + version = "2.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-qvP51HVIOcLDJKq8/hcJyXKsI2iUFwoPQQZvTKE28KU="; + sha256 = "0hsmn3irixrgmd04pm0f89gn44fdn2nkcp92x7gc2kncwkval6hc"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index baf12741b873..9804507423ec 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "02mbmwljcvqj3ksj2irdm8849lcxzwa6fycgjqb0i75cgidxpans"; + sha256 = "sha256-2FAnshIxaA52EwwwABBQ0sedAsz561YYxXDQo2Vcp1c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index f362c0686feb..d80840750743 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.3"; + version = "11.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "17zld62q4qw2z2q7i5kkpnyc3immgc4xs009hp53jq4qc38w0jm5"; + sha256 = "0ad0f3xghp77kg0vdns5m1lj796ysk9jrgl5k5h80imnnh9mz9b8"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index a4f907a1aaed..a49c2a8b743b 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.8.0"; + version = "0.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0b8a2e2145daefd9443ffa43639608203532e78a858af99c4c52c2b128ca681f"; + sha256 = "sha256-5JgF53ip72bne8AlGf126FIIvXi+u7rovJmMSCcZjEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index abdcd7317bc5..f8bd6825673c 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.3"; + version = "0.4.4"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "09n03wbyjh1b1gsiibf17fg86x7k1i1r1kpp94p7w1lcdbmn8v5c"; + sha256 = "sha256-jewibcsqWnl0OQ2oEEOSOcyyDCIGZiG4EZQfuFUbxK4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 4493eb3d9755..c6a488e4a285 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.18.0"; + version = "2.19.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9yk7gIaWgH6azsa9z/Y/fcw8wbFIwMS0KZ70PJZvcXc="; + sha256 = "sha256-kE9ugT26g3dY6VEMG+5R18ohfxaSRmJaE+aTcz3DNUM="; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix new file mode 100644 index 000000000000..e2e9ad081eaa --- /dev/null +++ b/pkgs/development/python-modules/subprocess-tee/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytestCheckHook +, enrich +}: + +buildPythonPackage rec { + pname = "subprocess-tee"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "01b0z8mcm568v9carhi0py1hs34wrbnlzyvdmhqzipql407kdpk2"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + enrich + ]; + + pythonImportsCheck = [ + "subprocess_tee" + ]; + + meta = with lib; { + homepage = "https://github.com/pycontribs/subprocess-tee"; + description = "A subprocess.run drop-in replacement that supports a tee mode"; + license = licenses.mit; + maintainers = with maintainers; [ putchar ]; + }; +} diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 5b7b17c8bb84..620ec7ce6892 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { homepage = "https://typer.tiangolo.com/"; description = "Typer, build great CLIs. Easy to code. Based on Python type hints."; license = licenses.mit; + # is incompatible with click8 + # https://github.com/tiangolo/typer/issues/280 + broken = true; maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5f9da6a4da01..4cda57cd9a23 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.35.0"; + version = "0.36.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-6/y9O7YYs1J+qFa/6pcHKiktkWa4bdEqUItK8IZGXJo="; + sha256 = "sha256-HeqsyAmqCUZ1htTv0tHywqYl3ZZBklTU37qaPV++vhU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 0af9e77acf57..500afa7c959f 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "arpa2cm"; - version = "0.5"; + version = "0.9.0"; - src = fetchFromGitHub { - sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4"; - rev = "version-${version}"; + src = fetchFromGitLab { + sha256 = "sha256-1z0fH8vZJiPkY/C654us9s2BULM1tlvvYcszNqk34yI="; + rev = "v${version}"; repo = pname; owner = "arpa2"; }; @@ -15,7 +15,19 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CMake Module library for the ARPA2 project"; + longDescription = '' + The CMake module library for the ARPA2 project, including the LillyDAP, + TLSPool and IdentityHub software stacks. Like the KDE Extra CMake Modules (ECM) + which is a large-ish collection of curated CMake modules of particular + interest to Qt-based and KDE Frameworks-based applications, the ARPA2 + CMake Modules (ARPA2CM) is a collection of modules for the software + stack from the ARPA2 project. This is largely oriented towards + TLS, SSL, X509, DER and LDAP technologies. The ARPA2 CMake Modules + also include modules used for product release and deployment of + the ARPA2 software stack. + ''; + homepage = "https://gitlab.com/arpa2/arpa2cm"; license = licenses.bsd2; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars fufexan ]; }; } diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix new file mode 100644 index 000000000000..9fcd87f3476d --- /dev/null +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchurl, appimageTools }: +let + name = "saleae-logic-2"; + version = "2.3.33"; + src = fetchurl { + url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; + sha256 = "09vypl03gj58byk963flskzkhl4qrd9qw1kh0sywbqnzbzvj5cgm"; + }; +in +appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = + let appimageContents = appimageTools.extractType2 { inherit name src; }; in + '' + mkdir -p $out/etc/udev/rules.d + cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + ''; + + meta = with lib; { + homepage = "https://www.saleae.com/"; + description = "Software for Saleae logic analyzers"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.j-hui ]; + }; +} diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 40181f16288a..ee8edfdf5b0e 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mustache-go"; - version = "1.2.0"; + version = "1.2.2"; goPackagePath = "github.com/cbroglie/mustache"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; - sha256 = "0mnh5zbpfwymddm1dppg9i9d1r8jqyg03z2gl6c5a8fgbrnxpjvc"; + sha256 = "sha256-ziWfkRUHYYyo1FqVVXFFDlTsBbsn59Ur9YQi2ZnTSRg="; }; meta = with lib; { diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index 54e275adf6ec..0037ab6c42d4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-comment", - "rev": "894b61d68a31d93c33ed48dcc7f427174b440abe", - "date": "2021-04-27T15:25:48-05:00", - "path": "/nix/store/w0yz9imzi33glwk6ilm0jqipcyzl8hgm-tree-sitter-comment", - "sha256": "1vfayzzcv6lj63pgcxr8f7rcd81jkgnfdlmhs39i7w3m0s6dv1qg", + "rev": "8d480c0a86e3b95812252d29292b2686eb92418d", + "date": "2021-08-13T15:03:50-05:00", + "path": "/nix/store/4aqsac34f0pzpa889067dqci743axrmx-tree-sitter-comment", + "sha256": "0fqhgvpd391nxrpyhxcp674h8qph280ax6rm6dz1pj3lqs3grdka", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index f88c5f9cf996..4de8502e4151 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "c61212414a3e95b5f7507f98e83de1d638044adc", - "date": "2021-03-27T10:08:51-07:00", - "path": "/nix/store/a8cd3sv1j900sd8l7cdjw91iw7pp3jhv-tree-sitter-cpp", - "sha256": "04nv9j03q20idk9pnm2lgw7rbwzy5jf9v0y6l102by68z4lv79fi", + "rev": "53afc568b70e4b71ee799501f34c876ad511f56e", + "date": "2021-08-13T10:48:59-05:00", + "path": "/nix/store/6gj41lh1fnnmcrz4c1bk3ncw0kpm97nm-tree-sitter-cpp", + "sha256": "02avniqmb5hgpkzwmkgxhrxk296dbkra9miyi5pax461ab4j7a9r", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index 4dc81284db91..4699358f6452 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "db7139393e50765520618fa469f41dfbb0b3822b", - "date": "2021-07-06T21:05:19+02:00", - "path": "/nix/store/k67b4bn67zd3dj9yg0q7jywy3vnkv8gw-tree-sitter-fish", - "sha256": "09l5myivlq3z53nqlx8x8c45sww2k7vmjp8z0rvwzv08rnym0fah", + "rev": "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f", + "date": "2021-08-02T21:46:56+01:00", + "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", + "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 1e00f279d68f..1a0bf43fff47 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6", - "date": "2021-06-18T23:36:08+02:00", - "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell", - "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8", + "rev": "30eea3c1339e573cda5dcffd8f9b06003ec31789", + "date": "2021-08-07T14:37:05+02:00", + "path": "/nix/store/b99w2q2y5gjj5h1bxipncaf40dyx5sd2-tree-sitter-haskell", + "sha256": "0cch7bcr4d9ll92vhcp79bjzs9dw0glvdrdj2q2h2mg5mmkzcya8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index 8c190011fd0f..b2a0b71f41c2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "d93af487cc75120c89257195e6be46c999c6ba18", - "date": "2021-03-04T14:11:18-08:00", - "path": "/nix/store/26yjfh6v17n4ajs9ln7x25sf1m3ijcjg-tree-sitter-html", - "sha256": "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy", + "rev": "af9339f3deb131ab99acfac906713b81dbcc41c9", + "date": "2021-07-11T11:04:28-07:00", + "path": "/nix/store/jg23pmi6jfy4kykah645gl44a145929c-tree-sitter-html", + "sha256": "1qb4rfbra3nc0fwmla8q1hb4r48k8cv3nl60zc24xhrw3q1d9zh1", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 24fd79d5116c..08ad936562c4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6de6d604c243b68f90dce14130d536c694d90dcc", - "date": "2021-06-29T15:54:12-07:00", - "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript", - "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6", + "rev": "bc2eb3994fd7cc605d27a32f9fcbee80bbb57f6d", + "date": "2021-08-13T14:29:43-07:00", + "path": "/nix/store/jkq26hbij9si8ri8k5agkdadr3p1nmbi-tree-sitter-javascript", + "sha256": "0f6bny38za17mmwqw0q0nmdb4f9i0xs7kbzixxgi44yyd43r5pzp", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index fdc910c4fd5c..b96375e3caf0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "7f720661de5316c0f8fee956526d4002fa1086d8", - "date": "2021-05-11T16:35:53+02:00", - "path": "/nix/store/ssqxahrza89qmb97bxas6dvhbqd7w0dr-tree-sitter-latex", - "sha256": "14jfmbv3czs643bggcsi3pyxhf81jirpvg8hxcbcdx1f3fzhs16m", + "rev": "2c0d03a36ee979bc697f6a9dd119174cf0ef15e0", + "date": "2021-07-19T17:50:34+02:00", + "path": "/nix/store/vrpfbjfps3bd9vrx8760l0vx7m7ijhja-tree-sitter-latex", + "sha256": "0dfpdv5sibvajf2grlc0mqhyggjf6ip9j01jikk58n1yc9va88ib", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index ce1e4f1bb38d..be89244fc6e7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-lua", - "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23", - "date": "2021-03-05T14:55:53+01:00", - "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua", - "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms", + "rev": "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6", + "date": "2021-08-02T15:13:28+02:00", + "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua", + "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index ff638a08baf0..f857c40c4fe1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "50f38ceab667f9d482640edfee803d74f4edeba5", - "date": "2021-04-27T17:21:51-05:00", - "path": "/nix/store/fhf3mvxg17g0xli59cgmmwqy4g21fbzj-tree-sitter-nix", - "sha256": "11gifb9b7x9v223hsrcb6wlkqpxbc4p5v4ny9aixzi9k8g0jhb3d", + "rev": "83ee5993560bf15854c69b77d92e34456f8fb655", + "date": "2021-07-21T20:36:40-05:00", + "path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix", + "sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 6b64a962a523..6f62a595ee3d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "5e89808d490d893799ebcf229130afe4cf2b0324", - "date": "2021-06-22T09:23:44+02:00", - "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php", - "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi", + "rev": "63cebc37ebed42887f14cdd0baec961d5a1e16c1", + "date": "2021-08-10T20:56:40+02:00", + "path": "/nix/store/bh4yl563l5fgh7r8f95zzybsavci8hyh-tree-sitter-php", + "sha256": "1psiamww22imw05z0h34yks7vh7y4x4bdn62dwic1gpwfbjdrfmr", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index 75329fc63a00..ed48c146fbe2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4", - "date": "2021-06-23T15:37:27-07:00", - "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala", - "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk", + "rev": "ec38674996753f9631615fa558d4f1fa3bf90633", + "date": "2021-08-08T14:43:30-07:00", + "path": "/nix/store/2b0z1j06gvpcn1rvq8hv5vdqlh3qlzmv-tree-sitter-scala", + "sha256": "1xv544wnyd075g5pc8lxi0ix6wrwiv82sdjhzf3wd1np42vxq3d4", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 04ad785f76f9..1a399772957f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "28e757a2f498486931b3cb13a100a1bcc9261456", - "date": "2021-05-04T14:04:30-07:00", - "path": "/nix/store/d90hgv5g374a6mrwhq9vcxk6d6lp2ags-tree-sitter-typescript", - "sha256": "0dxy5h68hhypzq0z15q8iawjgw3kx7dlpw76zv6xkxh25idqgxqh", + "rev": "d598c96714a2dc9e346589c63369aff6719a51e6", + "date": "2021-08-02T14:05:14-07:00", + "path": "/nix/store/hf714sspmakhzra9bqazhbb0iljva1hi-tree-sitter-typescript", + "sha256": "0yra8fhgv7wqkik85icqyckf980v9ch411mqcjcf50n5dc1siaik", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index 27bad6b51d69..09c8531c938b 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; @@ -8,7 +8,6 @@ rustPlatform.buildRustPackage rec { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; }; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 915dad400b4c..1700fd14b3a3 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-08-09"; - cargoSha256 = "sha256-r01riAztIlwxRjvqQXofmqv5875nqQ0Qb9KALvKy4u8="; + version = "2021-08-16"; + cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-l9F/cznYHxBdnb3NerIXzOMrzRnxdka0vExzUtKkBfw="; + sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index 91bde976ebdb..add400e4d0e8 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -53,13 +53,11 @@ echo "Extension version: $extension_ver" build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" # We need devDependencies to build vsix. -jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ +# `esbuild` is a binary package an is already in nixpkgs so we omit it here. +jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \ --arg ver "$extension_ver" \ >"$build_deps/package.json.new" -# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195 -sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new" - old_deps="$(jq '.dependencies' "$build_deps"/package.json)" new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)" if [[ "$old_deps" == "$new_deps" ]]; then diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 03ee72289014..68eb00f4eb6d 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.9.4"; + version = "0.10"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "09zj4lgsbx0yp4i8ij9nh7wzylfcj421jzf1kkc2zpnn5hgynsb5"; + sha256 = "sha256-T3HFhFKHsUcOOCXaA1NG3aDE0k5frnhqjCI8aV18EjQ="; }; postUnpack = '' diff --git a/pkgs/games/ballerburg/default.nix b/pkgs/games/ballerburg/default.nix index ceb95059eded..43b274a12825 100644 --- a/pkgs/games/ballerburg/default.nix +++ b/pkgs/games/ballerburg/default.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, SDL }: +{ lib, stdenv, fetchurl, cmake, SDL, makeDesktopItem, copyDesktopItems +, imagemagick }: -stdenv.mkDerivation rec { +let + + icon = fetchurl { + url = "https://baller.tuxfamily.org/king.png"; + sha256 = "1xq2h87s648wjpjl72ds3xnnk2jp8ghbkhjzh2g4hpkq2zdz90hy"; + }; + +in stdenv.mkDerivation rec { pname = "ballerburg"; version = "1.2.0"; @@ -9,10 +17,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-BiX0shPBGA8sshee8rxs41x+mdsrJzBqhpDDic6sYwA="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake copyDesktopItems imagemagick ]; buildInputs = [ SDL ]; + desktopItems = [ + (makeDesktopItem { + name = "Ballerburg"; + desktopName = "Ballerburg SDL"; + type = "Application"; + exec = "_NET_WM_ICON=ballerburg ballerburg"; + comment = meta.description; + icon = "ballerburg"; + categories = "Game;"; + }) + ]; + + postInstall = '' + # Generate and install icon files + for size in 16 32 48 64 72 96 128 192 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert ${icon} -sample "$size"x"$size" \ + -background white -gravity south -extent "$size"x"$size" \ + $out/share/icons/hicolor/"$size"x"$size"/apps/ballerburg.png + done + ''; + meta = with lib; { description = "Classic cannon combat game"; longDescription = '' diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index d8174417cb35..acbc0c4cbc22 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,30 +10,30 @@ "version": "1.1.37" }, "stable": { - "name": "factorio_alpha_x64-1.1.36.tar.xz", + "name": "factorio_alpha_x64-1.1.37.tar.xz", "needsAuth": true, - "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", + "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", + "version": "1.1.37" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.35.tar.xz", + "name": "factorio_demo_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", + "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly", "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.37/demo/linux64", + "version": "1.1.37" }, "stable": { - "name": "factorio_demo_x64-1.1.36.tar.xz", + "name": "factorio_demo_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "15fl4pza7n107rrmmdm26kkc12fnrmpn6rjb4ampgzqzn1fq854s", + "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/demo/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/demo/linux64", + "version": "1.1.37" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.37" }, "stable": { - "name": "factorio_headless_x64-1.1.36.tar.xz", + "name": "factorio_headless_x64-1.1.37.tar.xz", "needsAuth": false, - "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", + "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.36/headless/linux64", - "version": "1.1.36" + "url": "https://factorio.com/get-download/1.1.37/headless/linux64", + "version": "1.1.37" } } } diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index ec02e8c4f0e0..e309e8e8b264 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -52,10 +52,11 @@ */ stdenv.mkDerivation rec { + pname = "brgenml1cupswrapper"; + version = "3.1.0-1"; - name = "brgenml1cupswrapper-3.1.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101125/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101125/brgenml1cupswrapper-${version}.i386.deb"; sha256 = "0kd2a2waqr10kfv1s8is3nd5dlphw4d1343srdsbrlbbndja3s6r"; }; diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 6cdff2c4124e..fd439e9cd73d 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -35,10 +35,11 @@ let ''; in stdenv.mkDerivation rec { + pname = "brgenml1lpr"; + version = "3.1.0-1"; - name = "brgenml1lpr-3.1.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101123/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101123/brgenml1lpr-${version}.i386.deb"; sha256 = "0zdvjnrjrz9sba0k525linxp55lr4cyivfhqbkq1c11br2nvy09f"; }; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 0d6ec276b5f4..57efae68af31 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups -, ghostscript, pkgsi686Linux, zlib }: +{ lib +, stdenv +, fetchurl +, unzip +, autoconf +, automake +, libtool +, makeWrapper +, cups +, ghostscript +, pkgsi686Linux +, zlib +}: let - i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; - i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; + i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { }; + i686_libxml2 = pkgsi686Linux.callPackage ({ libxml2 }: libxml2) { }; commonVer = "4.10"; version = "3.70"; dl = "8/0100007658/08"; - versionNoDots = builtins.replaceStrings ["."] [""] version; + versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version; src_canon = fetchurl { url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-uken-05.tar.gz"; sha256 = "0424lvyrsvsb94qga4p4ldis7f714c5yw5ydv3f84mdl2a7papg0"; @@ -24,18 +35,18 @@ stdenv.mkDerivation { inherit version; src = src_canon; - phases = [ "unpackPhase" "installPhase" ]; - postUnpack = '' (cd $sourceRoot; tar -xzf Sources/cndrvcups-common-${commonVer}-1.tar.gz) (cd $sourceRoot; tar -xzf Sources/cndrvcups-lb-${version}-1.tar.gz) ''; - nativeBuildInputs = [ makeWrapper unzip autoreconfHook libtool ]; + nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool ]; buildInputs = [ cups zlib ]; installPhase = '' + runHook preInstall + ## ## cndrvcups-common buildPhase ## @@ -213,7 +224,9 @@ stdenv.mkDerivation { makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "$out/bin" - ''; + + runHook postInstall + ''; meta = with lib; { description = "CUPS Linux drivers for Canon printers"; diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 40243bb91969..5a6ea08a8e16 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, cups}: stdenv.mkDerivation rec { - name = "cups-bjnp-1.2.2"; + pname = "cups-bjnp"; + version = "1.2.2"; src = fetchurl { - url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; + url = "mirror://sourceforge/cups-bjnp/cups-bjnp-${version}.tar.gz"; sha256 = "0sb0vm1sf8ismzd9ba33qswxmsirj2z1b7lnyrc9v5ixm7q0bnrm"; }; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index eae421240630..cfe53e48d679 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -3,7 +3,8 @@ let color-profiles = stdenv.mkDerivation { - name = "splix-color-profiles-20070625"; + pname = "splix-color-profiles"; + version = "unstable-2007-06-25"; src = fetchurl { url = "http://splix.ap2c.org/samsung_cms.tar.bz2"; @@ -17,14 +18,14 @@ let }; in stdenv.mkDerivation rec { - name = "splix-svn-${rev}"; - rev = "315"; + pname = "splix-svn"; + version = "315"; src = fetchsvn { # We build this from svn, because splix hasn't been in released in several years # although the community has been adding some new printer models. url = "svn://svn.code.sf.net/p/splix/code/splix"; - inherit rev; + rev = version; sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix index e06a0c911624..73d88ad19c24 100644 --- a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix +++ b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -9,14 +9,14 @@ let driver = "epson-inkjet-printer-workforce-635-nx625-series-1.0.1"; }; in stdenv.mkDerivation rec { - name = "epson-inkjet-printer-workforce-635-nx625-series"; + pname = "epson-inkjet-printer-workforce-635-nx625-series"; version = "1.0.1"; src = fetchurl { # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm" + "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${pname}-${version}-1lsb3.2.src.rpm" + "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${pname}-${version}-1lsb3.2.src.rpm" ]; sha256 = "19nb2h0y9rvv6rg7j262f8sqap9kjvz8kmisxnjg1w0v19zb9zf2"; }; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { let filterdir = "$out/cups/lib/filter"; docdir = "$out/share/doc"; - ppddir = "$out/share/cups/model/${name}"; + ppddir = "$out/share/cups/model/${pname}"; libdir = if stdenv.system == "x86_64-linux" then "lib64" else if stdenv.system == "i686_linux" then "lib" @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { cd ../${srcdirs.driver} for ppd in ppds/*; do - substituteInPlace "$ppd" --replace '/opt/${name}' "$out" + substituteInPlace "$ppd" --replace '/opt/${pname}' "$out" gzip -c "$ppd" > "${ppddir}/''${ppd#*/}" done cp COPYING.EPSON README "${docdir}" @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { To use the driver adjust your configuration.nix file: services.printing = { enable = true; - drivers = [ pkgs.${name} ]; + drivers = [ pkgs.${pname} ]; }; ''; downloadPage = "https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f"; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index db1da676a515..5804eb60930d 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchpatch, fetchurl, pkg-config, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { - name = "foomatic-filters-4.0.17"; + pname = "foomatic-filters"; + version = "4.0.17"; src = fetchurl { - url = "https://www.openprinting.org/download/foomatic/${name}.tar.gz"; + url = "https://www.openprinting.org/download/foomatic/foomatic-filters-${version}.tar.gz"; sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 9cd76c11ccea..6b1bfefd7014 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,10 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.3.4"; + pname = "gutenprint"; + version = "5.3.4"; src = fetchurl { - url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; + url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index d2ba2685a291..84272898f52c 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "M33-Linux-2016-06-23"; + pname = "M33-Linux"; + version = "unstable-2016-06-23"; src = fetchFromGitHub { owner = "donovan6000"; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 8fafd1b6ebcc..414a207fa544 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: stdenv.mkDerivation rec { - name = "xwiimote-2"; + pname = "xwiimote"; + version = "2"; + src = fetchurl { - url = "https://github.com/dvdhrm/xwiimote/releases/download/${name}/${name}.tar.xz"; + url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-${version}/xwiimote-${version}.tar.xz"; sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 872ee8571f30..869440856f9a 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "bsod-0.1"; +stdenv.mkDerivation rec { + pname = "bsod"; + version = "0.1"; src = fetchurl { - url = "https://www.vanheusden.com/bsod/bsod-0.1.tgz"; + url = "https://www.vanheusden.com/bsod/bsod-${version}.tgz"; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 160c8733ff5c..ba4f88dbcad0 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: stdenv.mkDerivation rec { - name = "dosbox-0.74-3"; + pname = "dosbox"; + version = "0.74-3"; src = fetchurl { - url = "mirror://sourceforge/dosbox/${name}.tar.gz"; + url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"; }; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 2011d8ce0375..6bc4b1480ffc 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,10 +1,12 @@ {lib, stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: -stdenv.mkDerivation { - name = "fakenes-0.5.9b3"; +stdenv.mkDerivation rec { + pname = "fakenes"; + version = "0.5.9-beta3"; + src = fetchurl { - url = "mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz"; + url = "mirror://sourceforge/fakenes/fakenes-${version}.tar.gz"; sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index abc676ffa632..0fbd12fc3651 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: -stdenv.mkDerivation { - name = "gens-gs-7"; +stdenv.mkDerivation rec { + pname = "gens-gs"; + version = "7"; src = fetchurl { - url = "http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz"; + url = "http://retrocdn.net/images/6/6d/Gens-gs-r${version}.tar.gz"; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 803efe5149c2..ebbdc667ef1e 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, pkg-config, gtk2, alsa-lib, SDL}: stdenv.mkDerivation rec { - name = "uae-0.8.29"; + pname = "uae"; + version = "0.8.29"; src = fetchurl { - url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/${name}.tar.bz2"; + url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2"; sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4"; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index f8b9e5906f3e..ba9d538b6631 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "vice-3.1"; + pname = "vice"; + version = "3.1"; src = fetchurl { - url = "mirror://sourceforge/vice-emu/vice-3.1.tar.gz"; + url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 8621d213b79d..3b24584f7e63 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,10 +1,12 @@ { lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: -stdenv.mkDerivation { - name = "wxmupen64plus-0.3"; +stdenv.mkDerivation rec { + pname = "wxmupen64plus"; + version = "0.3"; + src = fetchurl { - url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2"; + url = "https://bitbucket.org/auria/wxmupen64plus/get/${version}.tar.bz2"; sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 4a6b1fbda279..e965816d0257 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -13,7 +13,8 @@ let }; in stdenv.mkDerivation { - name = "zsnes-1.51"; + pname = "zsnes"; + version = "1.51"; src = fetchFromGitHub { owner = "emillon"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 800a81d2ffcd..63ca76e391f4 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -6,10 +6,11 @@ with lib; stdenv.mkDerivation rec { - name = "slock-1.4"; + pname = "slock"; + version = "1.4"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/slock-${version}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 4813e2493075..1602c94c0992 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam }: -stdenv.mkDerivation { - name = "vlock-2.2.2"; - src = fetchurl - { - url = "mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz"; +stdenv.mkDerivation rec { + pname = "vlock"; + version = "2.2.2"; + + src = fetchurl { + url = "mirror://debian/pool/main/v/vlock/vlock_${version}.orig.tar.gz"; sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; }; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 600528a79444..680f9c0a5bcb 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,10 +2,11 @@ , libXdmcp, libXt, autoreconfHook }: stdenv.mkDerivation rec { - name = "xlockmore-5.66"; + pname = "xlockmore"; + version = "5.66"; src = fetchurl { - url = "http://sillycycle.com/xlock/${name}.tar.xz"; + url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index c6dafd2a8127..ec7e8f4e7e5c 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -2,7 +2,8 @@ , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { - name = "xss-lock-git-2018-05-31"; + pname = "xss-lock"; + version = "unstable-2018-05-31"; src = fetchFromGitHub { owner = "xdbob"; diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index c563cca05efe..6908429e21b9 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { - name = "xtrlock-pam-3.4-post-20150909"; + pname = "xtrlock-pam"; + version = "3.4-post-20150909"; src = fetchgit { url = "https://github.com/aanatoly/xtrlock-pam"; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index fc7062d904c3..c3c22ac8f159 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -5,10 +5,11 @@ }: buildPythonApplication rec { - name = "solfege-3.23.4"; + pname = "solfege"; + version = "3.23.4"; src = fetchurl { - url = "mirror://sourceforge/solfege/${name}.tar.gz"; + url = "mirror://sourceforge/solfege/solfege-${version}.tar.gz"; sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; }; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ca33df47d49b..24b60ea1d9e3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-07-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "f5e5dda7587db72b074edbc3b573d52df639f9a5"; - sha256 = "1ddr28v44llmfsdf2l3ybgwijhv49dddghdk396nk0sw883a3hs8"; + rev = "acd1a7031e71ed053348c2cd4ef3408f4fdfbb19"; + sha256 = "0vxk17p37a2fs9gm68wdlfqfyw8jzw3hp1yjg0n3b4yppl9j50r5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -257,12 +257,12 @@ final: prev: awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-07-09"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "dbb29a451bb5441e860e70a35b925e43ab307e3f"; - sha256 = "1qd9rfbq0b9jj38arv2mwyrlg7vfpia293lbyhxgn3ilsl85m63h"; + rev = "facbd7269201b1766369be9abc8bfc183938a9ae"; + sha256 = "11bdzds9qyr56sqwl2c7cy7gll32dd3fzy8bx1b0rg7ylwlyqllf"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-08-14"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "0c4c37eb3188230b11493adac68aac491c5e6a07"; - sha256 = "0pc5rrzhcrp7p5wwid4ggdakp5y05ki0hkm04bflq0y4ib4haa4c"; + rev = "7a19aac3d401c997a6fb7067a7756a4a77184c2e"; + sha256 = "1jbbnd7s2kql44zv7xkv9hmyj0482yjnm57l8nl0kdf8b61zzi3s"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -437,12 +437,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "64c2f6151d9794b83af47a26717973625587d8ef"; - sha256 = "1hysjkxd9g7lrwvsqw0c4ynnmshxijcbql4zl9mjww89fsz96i09"; + rev = "80f2d03b1d7d8a5032689a17c9a234d464a67405"; + sha256 = "0k5v490p22j3ghfb6c436z0i3fq18sj0y4x01axrl4iy1jpwn3v2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -519,6 +519,90 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; + cmp-buffer = buildVimPluginFrom2Nix { + pname = "cmp-buffer"; + version = "2021-08-11"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-buffer"; + rev = "5742a1b18ebb4ffc21cd07a312bf8bacba4c81ae"; + sha256 = "0nh53gqzbm500rvwc59hbl1sg12qzpk8za3z6rvsg04s6rqv479f"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; + }; + + cmp-calc = buildVimPluginFrom2Nix { + pname = "cmp-calc"; + version = "2021-08-08"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-calc"; + rev = "bac4f988d14665a6a681df3646ff1baa2affc2da"; + sha256 = "09g5pglbfzgnzl0lbn1fa27fh88a5pv2s2agmbw0gh4idnrvi66x"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; + }; + + cmp-emoji = buildVimPluginFrom2Nix { + pname = "cmp-emoji"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-emoji"; + rev = "a80d20b3461b802b3ff6f4cd60f7b99399fd7757"; + sha256 = "0q70zbd4fw6x62zar7ph1dp6zwri6dqnyprl58p6w3k5n4xgpdrf"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; + }; + + cmp-nvim-lsp = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lsp"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lsp"; + rev = "09e4ab0fb66ad07d64b311d1bd7916905bf3364b"; + sha256 = "0573ywym8favv12g78qln4zx15j1ic26y8j2rbdlh8n22zll0v1x"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; + }; + + cmp-path = buildVimPluginFrom2Nix { + pname = "cmp-path"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-path"; + rev = "175a3854242f7dd43d706e2e0acc4f08ab1ed9ee"; + sha256 = "1pimzhp5hh9gg7f37x4mklxxg44a7fnzli7mv46p73b3w97vkbl4"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-path/"; + }; + + cmp-vsnip = buildVimPluginFrom2Nix { + pname = "cmp-vsnip"; + version = "2021-08-13"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-vsnip"; + rev = "1f7c99719adbb2258c697dc43c31729ab73a8d99"; + sha256 = "1a252mzi5nzcml2g52g5nwlih40dh19yshns6dlk5gmfwa0mf3z6"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; + }; + + cmp_luasnip = buildVimPluginFrom2Nix { + pname = "cmp_luasnip"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "saadparwaiz1"; + repo = "cmp_luasnip"; + rev = "1852a9e9e3a0e0ba0363e3be6c87f46982fba549"; + sha256 = "1ji3ys0k0sw23yh4yk3pgb2ab895jfsjnsjrpy0idvmxclk20l0m"; + }; + meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; @@ -593,12 +677,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "9b224047e4596636cbc1e112d38d7b6bb48a2c15"; - sha256 = "105dsskbxir7w5665dfs5m2dwn4l85jwvmwflkqfvgf75538hgsw"; + rev = "1296df441756a5249319369640f208089a10efe4"; + sha256 = "1p6gikl6fw6fvbb7f76mb88ckcw6vp4llzz601k0f6rrna4xhjab"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1919,12 +2003,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-09"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "083dc2f485571546144e287c38a96368ea2e79a1"; - sha256 = "0vrb900p2rc323axb93hc7jwcxg8455zwqsvxm9vkd2mcsdpn33w"; + rev = "7875d8c4d94f98f7a1a65b898499fa288e7969b3"; + sha256 = "13hzghpzglw6cr4hwsp7qvp6a7dkh2fk2sg4nzzazgmfych485cm"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2532,12 +2616,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-08-13"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "e7d0b761fd9d4f2c326a4e421592b4c5ea51ae44"; - sha256 = "1zhq8wjpy4yx1mcyahscflfjm52hb7pfpxv51vmwlh2rp044b6j1"; + rev = "303f4a17f06b41c99210afaa6b21a7a16da533db"; + sha256 = "0rp1nc4hghn0i7ipbd6n0ja3zb5zv44pm9snfwlai2p5c8awi39z"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2676,12 +2760,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "a4a53a40eae92d9974efc5aaa73a628ff767cf06"; - sha256 = "1080wrf19vvjjfjkcag27rncic38lzl19vp6jxgr8vi5jppmnfd6"; + rev = "d1084c0ac413d6ad1ed3ec290604e7e2fbe0aae1"; + sha256 = "1qjs3wj4svjvbangivpvg7j4swm50d7s0ll1qsg61s59jchp1gjq"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2698,6 +2782,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lir-nvim = buildVimPluginFrom2Nix { + pname = "lir-nvim"; + version = "2021-08-15"; + src = fetchFromGitHub { + owner = "tamago324"; + repo = "lir.nvim"; + rev = "2704b9374c541db9a1cb0da1f095d800cf1c5af3"; + sha256 = "1ixqq5jigm5fdbcgp611sjybvr8fyvfnm7z55g5nk9zk5gql4xma"; + }; + meta.homepage = "https://github.com/tamago324/lir.nvim/"; + }; + lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; version = "2021-05-16"; @@ -2772,12 +2868,12 @@ final: prev: lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-08-03"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "7ffcfe88334d0887833c9d8ca6f1231a11612cb5"; - sha256 = "0i40z1a5h8rk4blwadcxpid10i264gbl7lhl16hjllyl77bbvvgs"; + rev = "6298b12a8cd833144997854d37eb6052aedc4bf4"; + sha256 = "169vksccl0qzc98pfn4wx2cihw0l8zl19qvfbs6rjxh9lcnbmijf"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -2820,12 +2916,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-14"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "453244a4d2f86033bbc93e88cd1bd22b2ff2c48b"; - sha256 = "0hz1vhg5ls0vpaa2hgcgkjb4qbc6diyzf9a64bfmx87llgyjn1s4"; + rev = "8cb1b905331463efd55b03de34a1ab519dcb5f04"; + sha256 = "1jn7p1lf0zxhbbnzsriznvlw20f97z0s51afhlj4cqihr1sv81z7"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3240,12 +3336,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-08-03"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3226b98318518bef47f55218041adfdf99c36e9a"; - sha256 = "09r6k5afd940cf44gdb62ffnh0ns32qr20vxxqgsw3rdi5558wfc"; + rev = "16de1b46e993e0b1e749c2345584c79ba14d11c1"; + sha256 = "0171v70ywnzpgzaadrw344511l3z7q60wvm6y5892z9m8mnwlw58"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3516,12 +3612,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-08-14"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "296167d2625e478d90f711bc8c0f2be96533b311"; - sha256 = "0m4qza9rzl2n2zcnb1wkj6idm3v6hdm427cd7yjy2rdbxk2cszb6"; + rev = "4d1bef41e01fbdcb31a47d722e107b29a1f9f428"; + sha256 = "1v9d7dsmchmkzqqf92rzhscv4n0n75jm0hqkq49m11d62dc5aic9"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3552,12 +3648,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "fcd3964ff7e28b7b441942ecf4f0c9d22d5b7bc9"; - sha256 = "0zkb5sfchqc91w6gacb3c43cm2n4wxjp1npzslrl4n1x4bsddz5l"; + rev = "4db2c4e2b59d16143bd8903c9bc73776b535be50"; + sha256 = "18dg3gdfwxhhz8snvw697r4nmc9aag3ylrzm7g84k67hpfir82r6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3670,6 +3766,18 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; + nvim-cmp = buildVimPluginFrom2Nix { + pname = "nvim-cmp"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "nvim-cmp"; + rev = "29ad715924eb8fafa8cd042b1a9eb66b03db0d0d"; + sha256 = "0c8wy66743dwf04p3l3fphndr58g9crlg96x90xkx2kr2s64a9dd"; + }; + meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; + }; + nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer-lua"; version = "2020-06-11"; @@ -3720,12 +3828,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-08-03"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "90a4025a4da7ac7a261026c50439bbd1bdfc8563"; - sha256 = "0apl84djyxy8ldcxv2xs0irgy7rjxcisqnl3wxcfi3fhvfsb0fz3"; + rev = "c9fc568ca157429cd76986ca2bfaa60488a7d2fb"; + sha256 = "09jk0v2ki0hsy1m2hg3dwi66yaqn670vnjbbrbdxrq55n260gds3"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3828,12 +3936,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-14"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cf0c25e372a6ee26f8a4254d6adb34021fec1a4c"; - sha256 = "1g678y71dmzmd7mfa26mj5blszq41shkbjdc87p1ydj1aq918s17"; + rev = "acb420880b83563c0ce83a3cea278cadfc7023e4"; + sha256 = "16bfn1qkbnicpkpisf5i4snra8glfg4rawvi52fpjqghxj9g1xz2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3912,12 +4020,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-08-06"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "cdeb723ffe955ff0d3fdcbbe3776632da2b41513"; - sha256 = "1r67avqfqv7rzjg1whwacy0938nql0j0vxb6rwsc4ay19zv1nng9"; + rev = "775012662eb2070e44b294d43938fa2625a9c836"; + sha256 = "0q39ddq6yb1iscgp1mdgdyhz0cmb794ycbfd5ph3xp8ffly4z7hk"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -4333,12 +4441,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-08-11"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "e632306af10f28a662d53bafed85a8cf8b4f63b7"; - sha256 = "1sa8lc3xyb8sbmh0iwrh2r3j3rqnp5pjmi99h3i0ksm7yqcmkkk4"; + rev = "e7aac8fb011d76ba5d432eebee990e3631bbc71b"; + sha256 = "09450ms1jzb37i8d0p133zr3ffpngcyn88x69d873hxnd1kxm5hm"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4523,6 +4631,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; + refactoring-nvim = buildVimPluginFrom2Nix { + pname = "refactoring-nvim"; + version = "2021-08-16"; + src = fetchFromGitHub { + owner = "theprimeagen"; + repo = "refactoring.nvim"; + rev = "aabd4776d3fd756b76f9e264496e1ea81cab77c4"; + sha256 = "168hpn3nxjsy3a5h3lvzk6gbhcfnh7k7p0xhpjxi67x1f99dnx0s"; + }; + meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; + }; + registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; version = "2021-08-11"; @@ -4621,12 +4741,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-08-01"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "8ead43e5fb5cf94976f1a40319d8f5e74d204e68"; - sha256 = "02hvy6ffzyc0gf7bngp6pngyf5an18f63mzdpxc3ldnxrd5dimjj"; + rev = "c5f8e2d8e05eff2e3142f6808c675f5df087785f"; + sha256 = "1qx2rz5a37dw5q3dn6p02cjsdhkfaip9mwfzi2prrk7hjcf9ix5m"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4971,12 +5091,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-12"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "957bae51700c7ec0da03ffd03f8f25b966c49ffe"; - sha256 = "1v120mr4s012gx95fr99kplv0ggypkjy5br3mzx86k4nmz1djwiv"; + rev = "cc7b7cc76427eb321955278587b84e84c0af246e"; + sha256 = "0i2j3s6n9zmpn8jc5waxl3biqca23f5cbiapgr9gwgqj22f1xzd2"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -6186,12 +6306,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7307a7bdae675d131d1e4ada2ea3dd84d2ffc303"; - sha256 = "0nqv1mqzizwx27jr8jmqqbb2a0dpyvlgpgbmv2fqk6gfqi44hkj8"; + rev = "4a7e9bad08ccfebcf294ea0091d74ee64d98d236"; + sha256 = "0b5ldixvf2f3bk7ivzb3s7zb8s4ir7gayli1i6bdq753flkjq0bx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7905,12 +8025,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-08-10"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "816751e279f1186d10520bad752206d5f91ce173"; - sha256 = "1z7gf14ifcza08yp0skdp1zad918fxpmws2p6b4zavmv4c6945ky"; + rev = "96738bdb81c493a4313b4bc5586ad540bd4ba6ce"; + sha256 = "0nan8crcsixwxmjj1xdbiizr50882102idd1ylynv7ihbf7hgmv8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8253,12 +8373,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-08-09"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "1189ef91c95f522159f9fd267a6bd1ea4b070195"; - sha256 = "12smb5p5lw3gakz6qbbdi11wcbyh8hap70csi8j0crr31fgjmsyf"; + rev = "bc49a0c2b5ded3f13445e47aa3cf8d3a0f972926"; + sha256 = "0l5gaf94p91xck6wn3a55dybd1d820dpq31v3sy3i2bxwfw0g8zd"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -8683,6 +8803,30 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-repeat/"; }; + vim-ReplaceWithRegister = buildVimPluginFrom2Nix { + pname = "vim-ReplaceWithRegister"; + version = "2021-07-05"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-ReplaceWithRegister"; + rev = "aad1e8fa31cb4722f20fe40679caa56e25120032"; + sha256 = "1cfgixq5smwbp55x2baaj1kw736w2mykysppphair44vb4w9rlgm"; + }; + meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/"; + }; + + vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix { + pname = "vim-ReplaceWithSameIndentRegister"; + version = "2020-06-17"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-ReplaceWithSameIndentRegister"; + rev = "0b7f542560bd21822a004e8accdf472eb477c9cf"; + sha256 = "04zvhqh9rjfiwfk8r0zci608pw09svqb42nvp8pvqb11xp2ydg2y"; + }; + meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/"; + }; + vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; version = "2021-07-16"; @@ -9490,12 +9634,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-08-01"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "ee21252c035004efd6fea40335cd311e71cf7a33"; - sha256 = "1grl78f5nhdryg1w0xh9j6fs1xd3j6dcv92vcvl9rp87ixgnmbag"; + rev = "aee3455e19686ce84225752de678a9725866248b"; + sha256 = "0j6xz4m8p351dmvhssi0f699609wpm5nz5q9xysy15vpwxds3nl9"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -9899,12 +10043,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "539742fdd56d13ada0aa3e9b0ab8690ca49b853f"; - sha256 = "03q6c2mb7gkhfzw6bjl77jsxffr3kb0vcj9ky80c6wmpi3vzmb1k"; + rev = "cb71390373e793875efd3609e0ad800d816ff4af"; + sha256 = "0l9yklk0pd7kgy39b09rirwpqbryy148ch9vffq3isyhdk6b3v10"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10019,12 +10163,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-14"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "fda3866f6b61961fbcd723ed83a61af29e272a3c"; - sha256 = "0cfv0x6sg2rap82p22kpkn8q8jdv6ixnk2dizgk3nqpdhq235h48"; + rev = "f70f292f9e680b3645c8e24ebee524264a9e75e2"; + sha256 = "1a45s282b85hjffdzd2375wv6c70dlli7l0wpcsq56ab4pyxamqz"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a5ec30daa711..5b6b9a2264d9 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -379,6 +379,10 @@ self: super: { dependencies = with self; [ vim-floaterm ]; }); + lir-nvim = super.lir-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -457,6 +461,10 @@ self: super: { configurePhase = "cd vim"; }); + refactoring-nvim = super.refactoring-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-treesitter plenary-nvim ]; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; version = skim.version; @@ -663,7 +671,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-wYxUo9zfflU7RTsTb7W9wc/WBsXhz3OLjC8CwUkRRiE="; + cargoSha256 = "16lcsi5mxmj79ky5lbpivravn8rjl4z3j3fsxrglb22ab4i7js3n"; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cbd457cf4bf7..39973d77e098 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -213,6 +213,13 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff +hrsh7th/cmp-buffer@main +hrsh7th/cmp-calc@main +hrsh7th/cmp-emoji@main +hrsh7th/cmp-nvim-lsp@main +hrsh7th/cmp-path@main +hrsh7th/cmp-vsnip@main +hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ @@ -224,6 +231,8 @@ ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim Inazuma110/deoplete-greek +inkarkat/vim-ReplaceWithRegister +inkarkat/vim-ReplaceWithSameIndentRegister inkarkat/vim-SyntaxRange int3/vim-extradite Iron-E/nvim-highlite @@ -605,6 +614,7 @@ ruifm/gitlinker.nvim rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +saadparwaiz1/cmp_luasnip sainnhe/edge sainnhe/gruvbox-material sainnhe/sonokai @@ -669,6 +679,7 @@ t9md/vim-smalls TaDaa/vimade takac/vim-hardtime tamago324/compe-zsh +tamago324/lir.nvim tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim @@ -681,6 +692,7 @@ tex/vimpreviewpandoc Th3Whit3Wolf/one-nvim@main theHamsta/nvim-dap-virtual-text ThePrimeagen/git-worktree.nvim +theprimeagen/refactoring.nvim ThePrimeagen/vim-apm thinca/vim-ft-diff_fold thinca/vim-prettyprint diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 1e69d9e81bae..a98102c36b02 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,12 +1,12 @@ { "name": "rust-analyzer", - "version": "0.2.702", + "version": "0.2.710", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", "vscode-languageclient": "^7.1.0-next.5", - "@rollup/plugin-commonjs": "^17.0.0", - "@rollup/plugin-node-resolve": "^13.0.0", + "d3": "^7.0.0", + "d3-graphviz": "^4.0.0", "@types/glob": "^7.1.4", "@types/mocha": "^8.2.3", "@types/node": "~14.17.5", @@ -17,7 +17,6 @@ "eslint": "^7.30.0", "glob": "^7.1.6", "mocha": "^9.0.2", - "rollup": "=2.51.1", "tslib": "^2.3.0", "typescript": "^4.3.5", "typescript-formatter": "^7.2.2", diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 479f9f4c6ea9..82491389791e 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -4,8 +4,9 @@ , jq , rust-analyzer , nodePackages -, setDefaultServerPath ? true , moreutils +, esbuild +, setDefaultServerPath ? true }: let @@ -21,7 +22,7 @@ let releaseTag = rust-analyzer.version; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ jq moreutils esbuild ]; # Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 postInstall = '' diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 5dc57f43e4ab..c5bc50cafd71 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -56,8 +56,8 @@ stdenv.mkDerivation { # and using clang directly here is a better option than relying on cctools. # On x86_64-darwin the Clang version is too old to support this mode. + lib.optionalString stdenv.isAarch64 '' - rm $out/bin/as - makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \ + rm $out/bin/${targetPrefix}as + makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ --add-flags "-x assembler -integrated-as -c" ''; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index c9b1d7c5f0a5..7c195cd2d7ca 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchzip }: +{ stdenv +, lib +, fetchurl }: -let version = "3.1"; in +stdenv.mkDerivation rec { + pname = "intel2200BGFirmware"; + version = "3.1"; -fetchzip { - name = "intel2200BGFirmware-${version}"; - url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; - sha256 = "0zjyjndyc401pn5x5lgypxdal21n82ymi3vbb2ja1b89yszj432b"; + src = fetchurl { + url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + hash = "sha256-xoGMEcGMwDDVX/g/ZLK62P7vSF53QvhPlKYdgRpiWL0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -D -m644 ipw2200-bss.fw $out/lib/firmware/ipw2200-bss.fw install -D -m644 ipw2200-ibss.fw $out/lib/firmware/ipw2200-ibss.fw install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 20f9f5aaa147..973e6d50adfe 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -88,7 +88,7 @@ assert (versionAtLeast version "4.9"); INET_MPTCP_DIAG = option no; # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. - CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no; + CC_STACKPROTECTOR_REGULAR = lib.mkForce (whenOlder "4.18" no); CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; # Detect out-of-bound reads/writes and use-after-free diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3acd18a4b281..c3f0aa742574 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" }, - "5.12": { - "extra": "-hardened1", - "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.139-hardened1.patch", diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix deleted file mode 100644 index e1e7aec2ce2d..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - 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; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index e35df218b387..61b17260f718 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.10"; + version = "5.13.11"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-f7Re9Nt6f9wqdfUgtHAvnGtSEBv6ULRAXYgQXa8RvDM="; + sha256 = "sha256-55BRj0JNQKwmSvlquNHr6ZaI7x/sBYzfZPHIblxK4lY="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 53f37e805fa7..9ff6d03fdab4 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v4l2loopback"; - version = "unstable-2020-04-22-${kernel.version}"; + version = "unstable-2021-07-13-${kernel.version}"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "d26e624b4ead762d34152f9f825b3a51fb92fb9c"; - sha256 = "sha256-OA45vmuVieoL7J83D3TD5qi3SBsiqi0kiQn4i1K6dVE="; + rev = "baf9de279afc7a7c7513e9c40a0c9ff88f456af4"; + sha256 = "sha256-uglYTeqz81fgkKYYU9Cw8x9+S088jGxDEGkb3rmkhrw=="; }; hardeningDisable = [ "format" "pic" ]; @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { buildInputs = [ kmod ]; + postInstall = '' + make install-utils PREFIX=$bin + ''; + + outputs = [ "out" "bin" ]; + makeFlags = [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index ddded73391d7..8c64671251ea 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.5"; + version = "4.3.7"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-faK0PjCz1/MHcixgj3Gb+xafDZhcdko0+gZp3DNIRHI="; + sha256 = "sha256-/TuexTu9Fo1Wegv83xQMlmUR/a94vVOdCRwaE8E76K0="; }; prePatch = '' diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 2c35d097b5b2..01abc596517d 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-RZwuoA9z+UnjQlqDqHMSaSKIuKu/qGBh5VBNrzeuac0="; + sha256 = "sha256-pzsbCxJ3N30XpjF//02SV6URhA6f6Wz8a6HvGxsK7M4="; }; - vendorSha256 = "sha256-EnTp4KgFyNGCLK5p1mE0yJLdFrhsLsmsSGJnDyWUVKo="; + vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0231c5fb6053..bef068f085ce 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.8.6"; + version = "2021.8.7"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 060a00006052..a3a2b07c149d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -88,6 +88,19 @@ let }); }) + # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment + (self: super: { + total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { + version = "0.58"; + src = fetchFromGitHub { + owner = "craigjmidwinter"; + repo = "total-connect-client"; + rev = version; + sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z"; + }; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -121,7 +134,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.6"; + hassVersion = "2021.8.7"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -138,7 +151,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1hahxvvlk32dbmv2lhn67w1ii5g24znvjqgsq318qv8c2qh5z5ws"; + sha256 = "0f69jcpxyr0kzziwl6bfj2jbn23hrj1796ml6jsk9mnpfkdsd9vi"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 14fe83ea5cb3..095f09d19ab5 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.25.0-64"; + version = "4.25.1-65"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-KLP7g1SQzVKu9Hnptb6s0FwmLSjhlAINJoJskja+bDM="; + sha256 = "sha256-1Gfnha0DRAH2q0HJQVZegFKjpnVVK+MxPUmYJsA8Xgc="; }; unpackPhase = '' diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index 2762f636f592..e511429bfc44 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, perl }: +{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }: stdenv.mkDerivation rec { pname = "mod_perl"; @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; + patches = [ + # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 + ../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch + ]; + buildInputs = [ apacheHttpd perl ]; buildPhase = '' perl Makefile.PL \ @@ -23,4 +28,6 @@ stdenv.mkDerivation rec { mv $out${perl}/* $out rm $out/nix -rf ''; + + passthru.tests = nixosTests.mod_perl; } diff --git a/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch b/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch new file mode 100644 index 000000000000..eb70d21ed5cb --- /dev/null +++ b/pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch @@ -0,0 +1,33 @@ +From 36ffbb7ad2c535180cae473b470a43f9db4fbdcd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 16 Aug 2021 13:27:28 +0200 +Subject: [PATCH] setup: add homeserver as console script + +With this change, it will be added to `$out/bin` in `nixpkgs` directly. +This became necessary since our old workaround, calling it as script, +doesn't work anymore since the shebangs were removed[1]. + +[1] https://github.com/matrix-org/synapse/pull/10415 +--- + setup.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/setup.py b/setup.py +index c47856351..27f1d842c 100755 +--- a/setup.py ++++ b/setup.py +@@ -133,6 +133,11 @@ setup( + long_description=long_description, + long_description_content_type="text/x-rst", + python_requires="~=3.6", ++ entry_points={ ++ 'console_scripts': [ ++ 'homeserver = synapse.app.homeserver:main' ++ ] ++ }, + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Topic :: Communications :: Chat", +-- +2.31.1 + diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 982ced37df4b..4cac9bdcb3fe 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,16 +12,15 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.39.0"; + version = "1.40.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dErfNHDUo0yGLbrRQdwbNkMVfnMfbrO3f7bsRwgRQMM="; + sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU="; }; patches = [ - # adds an entry point for the service - ./homeserver-script.patch + ./0001-setup-add-homeserver-as-console-script.patch ]; buildInputs = [ openssl ]; diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/pkgs/servers/matrix-synapse/homeserver-script.patch deleted file mode 100644 index 554a2c5f66c1..000000000000 --- a/pkgs/servers/matrix-synapse/homeserver-script.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/homeserver b/homeserver -new file mode 120000 -index 000000000..2f1d41351 ---- /dev/null -+++ b/homeserver -@@ -0,0 +1 @@ -+synapse/app/homeserver.py -\ No newline at end of file -diff --git a/setup.py b/setup.py -index 5ce06c898..f1ccd95bc 100755 ---- a/setup.py -+++ b/setup.py -@@ -115,6 +115,6 @@ setup( - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - ], -- scripts=["synctl"] + glob.glob("scripts/*"), -+ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), - cmdclass={"test": TestCommand}, - ) --- -2.22.0 - diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 3ff6b112a978..8e1b0864c9bc 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "2.3"; + version = "2.4"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "0pk3kwr6k6dz2vdx1kyv7mhj756j4bwsmdlmjzhh8ghczjqp2s2x"; + sha256 = "sha256-bEObiqgkSarYILwZE70OjRyEUy3QZg+FLocWljFRGNc="; }; buildInputs = [ libressl ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index eb03ea3ef6e1..d75b204db293 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -139,6 +139,9 @@ stdenv.mkDerivation rec { ++ optional (!enablePam) "--without-pam" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--bundled-libraries=!asn1_compile,!compile_et" + ] ++ optional stdenv.isAarch32 [ + # https://bugs.gentoo.org/683148 + "--jobs 1" ]; # python-config from build Python gives incorrect values when cross-compiling. diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 5779f5270f71..d917e54ec3fb 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon, libXext }: stdenv.mkDerivation rec { pname = "xdotool"; - version = "3.20160805.1"; + version = "3.20210804.2"; - src = fetchurl { - url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz"; - sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; + src = fetchFromGitHub { + owner = "jordansissel"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7N5f/BFtq/m5MsXe7ZCTUTc1yp+JDJNRF1P9qB2l554="; }; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ]; + buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon libXext ]; preBuild = '' mkdir -p $out/lib diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 6fafc1c253a9..ad12234bf27b 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -1,24 +1,25 @@ { fetchurl, bash, glibc, lib, stdenv }: stdenv.mkDerivation rec { - name = "daemontools-0.76"; + pname = "daemontools"; + version = "0.76"; src = fetchurl { - url = "https://cr.yp.to/daemontools/${name}.tar.gz"; + url = "https://cr.yp.to/daemontools/daemontools-${version}.tar.gz"; sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; }; patches = [ ./fix-nix-usernamespace-build.patch ]; configurePhase = '' - cd ${name} + cd daemontools-${version} sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc substituteInPlace src/Makefile \ --replace '/bin/sh' '${bash}/bin/bash -oxtrace' - sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests + sed -ie "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests cat ${glibc.dev}/include/errno.h ''; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index d874dea286e7..9f1239923ec4 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.9.0"; + version = "3.10.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-linux-x64.tar.gz"; - sha256 = "0gxi3zi6scfl9d3b26q7i1f6z39q9npqgik0cgb178an0ygpk3w5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-linux-x64.tar.gz"; + sha256 = "0rhsdxiz5lz4hlw6a1pkjfblsh42vnk9bw8xg7wbjl9wpld3rys1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-linux-amd64.tar.gz"; - sha256 = "0sk2qmyw7cchlyqrzq2ny516iq9qxh2ywiql8111c5ph2kx8m7az"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-linux-amd64.tar.gz"; + sha256 = "1s8w5kh9nfdv1vcdrpa2m76r2470k0j4frc3j3ijmqq1i0vv5yhk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-linux-amd64.tar.gz"; - sha256 = "1w626m38qr0qa9ccpb3f6wdggk3dridqh3jnx9z1zf6bdg2vspa1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0scisiswjs3jx0wm6q8i7pgpr2js3kiilq7wc29afyjck6xa14rh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-linux-amd64.tar.gz"; - sha256 = "0pdizb132a7r9n07hqmhrz57hhpmggvgbnmcc87xlpbzc5b72sin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-linux-amd64.tar.gz"; + sha256 = "1a62af80czj9sahb52fiz25p59nbzjlr1h7ycdxpjl9m1bxhvlfr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-linux-amd64.tar.gz"; - sha256 = "1xdldrsgh52lffbkxwc865qllr5sd9hsqksl55v0gm55acqh8jhd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-linux-amd64.tar.gz"; + sha256 = "11m1f80i33m4dh13z96yh655pfiwvk46sjspwql7s80kapl93pq9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz"; @@ -53,16 +53,16 @@ sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-linux-amd64.tar.gz"; - sha256 = "03475c9qhd5wb174xnzi84dj74zf1fy2i43d5b7911w09mdqrzb6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-linux-amd64.tar.gz"; + sha256 = "0inx40vasjlxfvzr0pxbzm6rki50h5x5qkzx2wc51vv3gjln104q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-linux-amd64.tar.gz"; - sha256 = "09jf18fmdvgnhx8nx5zbpyc8xgh0zr8w50z463vy4h62r3xyafs5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-linux-amd64.tar.gz"; + sha256 = "19zvqxf13lr98sp3p1ry3q1fvzx0rpxwz5wbk331n5jn0ljzr783"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1lvb3vs2yp0ybz2xn2za5f0nfipiisrpzwzfn0wgl9arh17v0phc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0vyqzphk75h1mk9p6wblgsw2cypycv32glzrnk4fildj48dakm5y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "04gaimdzh04v7f11xw1b7p95rbb142kbnix1zqas68wd6vpw9kyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1np74bfvp4hr70izb8sarxvga3nnvyi9j7y6f0lqqgrfk2ixn48r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0rpf48snjm5n1xn7s6lnda6ny1gjgmfsqmbibw6w7h7la0ff78jp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; @@ -89,8 +89,8 @@ sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-linux-amd64.tar.gz"; - sha256 = "1jvq530gz7bjcljlb3y6yvgfj1fgksgcxs48vl2j6xzyl6y56f6g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-linux-amd64.tar.gz"; + sha256 = "0rmk55qivand0wa82mxgvyzgg16nz1r3q99k0n9zdlvh9dbffnc8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; @@ -99,20 +99,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-darwin-x64.tar.gz"; - sha256 = "11smw4vy4pzy56smw2mkdaxs2ymkgq9zkhrlq512nx4xh3z46aiv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-darwin-x64.tar.gz"; + sha256 = "18q1v1n3a497wbbzzjngpl90wpjnffn9wnpdp171r47k6xvbcsyq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "1fdqp3lhqsm06crbwvyq5qbxy97n432mcnyqcrsd5202yyk6dzbs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-darwin-amd64.tar.gz"; + sha256 = "1jnwlhfyyxz7196igi3gas3459k4nq1f4m1i4vdnxhkskp5838l0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "1h5rvwy4mdb8566nj4hkxnfva77xrj33y7sxssk7y9gi6k0yx7qa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "0wy4ayrfqizf8izz5dgwv8xi5hvjh03jrg5lvglfph6549d4lpwc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; @@ -123,8 +123,8 @@ sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "0ww91jbi9z8qf0n820h6bx60x2jp4hvwy0aazw37392aczz1kz6d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-darwin-amd64.tar.gz"; + sha256 = "062xzx7408xqlppw1nixs205i83436n0cbjngzc65wm03bzzj7mh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; @@ -135,8 +135,8 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-darwin-amd64.tar.gz"; - sha256 = "036msa4h2s5glyfh58kgnimzkiyq4m2k8vhq20wj5mgzpza4gp8v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-darwin-amd64.tar.gz"; + sha256 = "01vrivbdhsl50kiv092j2a5jvikhrw1kzpa5ags701l721zslycq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz"; @@ -147,16 +147,16 @@ sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-darwin-amd64.tar.gz"; - sha256 = "02pfb2j5wsvz0mc99sqpv7fkg00drdmi8bwzvwkg3gr1kqlgvjbv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-darwin-amd64.tar.gz"; + sha256 = "0bj7ir7dpkfsb75bjl45irwi692zxnys0125kmwdn8gnamlij5fx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-darwin-amd64.tar.gz"; - sha256 = "1ddz2lh8sz4zy5dzwxnzq32ln9y24dx1b8pvkx8h66z3n0dwa368"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-darwin-amd64.tar.gz"; + sha256 = "0i06q1hrxi84r8ss3ck7jgk3g4lblkjvgm3wx35v551l0ynmmqqw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "008jqnrl08g3gd38vg2yjwxdn288z75sbp3ghl2cbncfah2lwwja"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0fwbh02n7cjmv6d9jbqpjnmvvdp1cnsyhy7gxd2863j4w5f17q48"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz"; @@ -167,8 +167,8 @@ sha256 = "18vrp0zzi92x4l5nkjszvd0zr7pk6nl6s3h5a3hvsz5qrj2830q3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "08rmknpwrbc9h57a3ddg05s0idxbbrcf46i2gkqknjzs7dr6wzas"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0jlvdnvcmml009a84lfa6745qwjsifa9zmdrv4gqy9p76iydfs1n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; @@ -183,8 +183,8 @@ sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0cg806zpax6q69nr9gdnj00i5lqfh5ljs62181m8jrpczdaryxcn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0ay8d84fc1hr1n4fpy1a4nj7bmhxzp86p0x68gz4rr9iwrd7xfgl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index dc603283ad3d..b65ea5e34968 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,32 +3,32 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.9.0" +VERSION="3.10.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.14.0" - "cloudflare=3.3.0" + "aws=4.15.0" + "cloudflare=3.4.0" "consul=3.2.0" "datadog=3.3.0" - "digitalocean=4.5.0" + "digitalocean=4.6.0" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.13.0" + "gcp=5.15.0" "github=4.2.0" "gitlab=4.1.0" - "hcloud=1.1.1" - "kubernetes=3.5.1" - "linode=3.2.0" + "hcloud=1.2.0" + "kubernetes=3.6.0" + "linode=3.3.0" "mailgun=3.1.0" "mysql=3.0.0" - "openstack=3.2.0" + "openstack=3.3.0" "packet=3.2.2" "postgresql=3.1.0" "random=4.2.0" - "vault=4.2.0" + "vault=4.3.0" "vsphere=4.0.1" ) diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 1bfb3be113da..0da2e7875f08 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: -stdenv.mkDerivation { - name = "tightvnc-1.3.10"; +stdenv.mkDerivation rec { + pname = "tightvnc"; + version = "1.3.10"; src = fetchurl { - url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2"; + url = "mirror://sourceforge/vnc-tight/tightvnc-${version}_unixsrc.tar.bz2"; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 419a7d04ee33..8303a1b4277b 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, perl, bash}: -stdenv.mkDerivation { - name = "atool-0.39.0"; +stdenv.mkDerivation rec { + pname = "atool"; + version = "0.39.0"; + src = fetchurl { - url = "mirror://savannah/atool/atool-0.39.0.tar.gz"; + url = "mirror://savannah/atool/atool-${version}.tar.gz"; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 3ed07544bb2b..4dddc4a5a6ae 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.9.1"; + pname = "cabextract"; + version = "1.9.1"; src = fetchurl { - url = "https://www.cabextract.org.uk/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/cabextract-${version}.tar.gz"; sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; }; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index bed0485e44a2..899640d90c45 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10.2"; + pname = "cromfs"; + version = "1.5.10.2"; src = fetchurl { - url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; + url = "https://bisqwit.iki.fi/src/arch/cromfs-${version}.tar.bz2"; sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 4822ea82d1e6..d2e1bebb3676 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -3,10 +3,11 @@ , withGog ? false, unar ? null }: stdenv.mkDerivation rec { - name = "innoextract-1.9"; + pname = "innoextract"; + version = "1.9"; src = fetchurl { - url = "https://constexpr.org/innoextract/files/${name}.tar.gz"; + url = "https://constexpr.org/innoextract/files/innoextract-${version}.tar.gz"; sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 79a40e6ca6be..57eb7e6f87a1 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gcc }: -stdenv.mkDerivation { - name = "pxattr-2.1.0"; +stdenv.mkDerivation rec { + pname = "pxattr"; + version = "2.1.0"; src = fetchurl { - url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; + url = "https://www.lesbonscomptes.com/pxattr/pxattr-${version}.tar.gz"; sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z"; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 9ef8eb43772a..852f538d6e31 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { - name = "gvolicon-2014-04-28"; + pname = "gvolicon"; + version = "unstable-2014-04-28"; + src = fetchgit { url = "https://github.com/Unia/gvolicon"; rev = "0d65a396ba11f519d5785c37fec3e9a816217a07"; diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix index cf55e0dd81d5..698205a2b076 100644 --- a/pkgs/tools/audio/midicsv/default.nix +++ b/pkgs/tools/audio/midicsv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "midicsv-1.1"; + pname = "midicsv"; + version = "1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz"; + url = "http://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; }; diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix index 51f5ba656168..c89404fbba1c 100644 --- a/pkgs/tools/audio/mpdsync/default.nix +++ b/pkgs/tools/audio/mpdsync/default.nix @@ -1,7 +1,8 @@ { stdenv, python2, fetchFromGitHub }: with python2.pkgs; stdenv.mkDerivation { - name = "mpdsync-2017-06-15"; + pname = "mpdsync"; + version = "unstable-2017-06-15"; src = fetchFromGitHub { owner = "alphapapa"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 358e662ca1e0..6adc24e5300d 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation { - name = "pa-applet-2012-04-11"; + pname = "pa-applet"; + version = "unstable-2012-04-11"; src = fetchgit { url = "git://github.com/fernandotcl/pa-applet.git"; diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index 03f446dc215b..5c995f407a7b 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: stdenv.mkDerivation { - name = "picotts-unstable-2018-10-19"; + pname = "picotts"; + version = "unstable-2018-10-19"; + src = fetchFromGitHub { repo = "picotts"; owner = "naggety"; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index a26bdb0d9a3f..4f99e60f4dbe 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - name = "dirvish-1.2.1"; + pname = "dirvish"; + version = "1.2.1"; + src = fetchurl { - url = "http://dirvish.org/${name}.tgz"; + url = "http://dirvish.org/dirvish${version}.tgz"; sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd"; }; diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix index 804c50830ce6..8c62ad6512e0 100644 --- a/pkgs/tools/backup/mt-st/default.nix +++ b/pkgs/tools/backup/mt-st/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mt-st-1.3"; + pname = "mt-st"; + version = "1.3"; src = fetchurl { - url = "https://github.com/iustin/mt-st/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/iustin/mt-st/releases/download/mt-st-${version}/mt-st-${version}.tar.gz"; sha256 = "b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de"; }; diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index aa72b02afbbd..b8476954949e 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtx-1.3.12"; + pname = "mtx"; + version = "1.3.12"; src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.gz"; + url = "mirror://gentoo/distfiles/mtx-${version}.tar.gz"; sha256 = "0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843"; }; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 2477fa6e4431..afb8489e1f42 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -9,12 +9,14 @@ , slang , autoreconfHook }: -stdenv.mkDerivation { - name = "partimage-0.6.9"; +stdenv.mkDerivation rec { + pname = "partimage"; + version = "0.6.9"; + enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2"; + url = "mirror://sourceforge/partimage/partimage-${version}.tar.bz2"; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 9322e62a3dc6..3ded8c6b8482 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { - name = "rsnapshot-1.4.3"; + pname = "rsnapshot"; + version = "1.4.3"; src = fetchurl { - url = "https://rsnapshot.org/downloads/${name}.tar.gz"; + url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; }; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index f580080e8796..cc6754b4a8c0 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { - name = "obex-data-server-0.4.6"; + pname = "obex-data-server"; + version = "0.4.6"; src = fetchurl { - url = "http://tadas.dailyda.com/software/${name}.tar.gz"; + url = "http://tadas.dailyda.com/software/obex-data-server-${version}.tar.gz"; sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 6ddbcd5652de..c18aa3a1c263 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { - name = "obexd-0.48"; + pname = "obexd"; + version = "0.48"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2"; + url = "mirror://kernel/linux/bluetooth/obexd-${version}.tar.bz2"; sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; }; diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index b81e8c4ea55b..2783c63899df 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }: stdenv.mkDerivation rec { - name = "obexfs-0.12"; + pname = "obexfs"; + version = "0.12"; src = fetchurl { - url = "mirror://sourceforge/openobex/${name}.tar.gz"; + url = "mirror://sourceforge/openobex/obexfs-${version}.tar.gz"; sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj"; }; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index fc2ff6128f75..3d9eda383ddf 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }: stdenv.mkDerivation rec { - name = "obexftp-0.24.2"; + pname = "obexftp"; + version = "0.24.2"; src = fetchurl { - url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; + url = "mirror://sourceforge/openobex/obexftp-${version}-Source.tar.gz"; sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; }; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 1079623cf2af..831644bd4ac0 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { - name = "openobex-1.7.2"; + pname = "openobex"; + version = "1.7.2"; src = fetchurl { - url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; + url = "mirror://sourceforge/openobex/openobex-${version}-Source.tar.gz"; sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; }; diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index 10f8d9701d40..ad3fee9792c6 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ccd2iso-0.3"; + pname = "ccd2iso"; + version = "0.3"; src = fetchurl { - url = "mirror://sourceforge/ccd2iso/${name}.tar.gz"; + url = "mirror://sourceforge/ccd2iso/ccd2iso-${version}.tar.gz"; sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 3fca8b2cd3c6..c9d49cfd4390 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}: -stdenv.mkDerivation { - name = "cdrdao-1.2.3"; +stdenv.mkDerivation rec { + pname = "cdrdao"; + version = "1.2.3"; src = fetchurl { - url = "mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2"; + url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2"; sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 28ed61ebd55e..1bc84cf59dfe 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: stdenv.mkDerivation rec { - name = "cdrkit-1.1.11"; + pname = "cdrkit"; + version = "1.1.11"; src = fetchurl { - url = "http://cdrkit.org/releases/${name}.tar.gz"; + url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz"; sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i"; }; diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix index ac0879e32172..7a8a6569e533 100644 --- a/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, zlib }: stdenv.mkDerivation rec { - nameNoVer = "uif2iso"; - name = "${nameNoVer}-0.1.7"; + pname = "uif2iso"; + version = "0.1.7"; src = fetchurl { - url = "http://aluigi.altervista.org/mytoolz/${nameNoVer}.zip"; + url = "http://aluigi.altervista.org/mytoolz/uif2iso.zip"; sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp"; }; diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index a31354670a04..2ebe9e5e0a35 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libdvdread, libdvdcss }: stdenv.mkDerivation rec { - name = "vobcopy-1.2.0"; + pname = "vobcopy"; + version = "1.2.0"; src = fetchurl { - url = "http://www.vobcopy.org/download/${name}.tar.bz2"; + url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2"; sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9"; }; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 5262fe06963b..54df481cd676 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: -let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; - shortRev = builtins.substring 0 7 rev; -in -stdenv.mkDerivation { - name = "vobsub2srt-git-20140817-${shortRev}"; +stdenv.mkDerivation rec { + pname = "vobsub2srt-git"; + version = "20140817-${builtins.substring 0 7 rev}"; + rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; src = fetchgit { inherit rev; diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix index 7f4273163a3e..5915d1439dff 100644 --- a/pkgs/tools/compression/lzham/default.nix +++ b/pkgs/tools/compression/lzham/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake } : -stdenv.mkDerivation { - name = "lzham-1.0"; +stdenv.mkDerivation rec { + pname = "lzham"; + version = "1.0"; src = fetchFromGitHub { owner = "richgel999"; repo = "lzham_codec"; - rev = "v1_0_release"; + rev = "v${lib.replaceStrings ["."] ["_"] version}_release"; sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v"; }; diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix index 01800aff8493..4f324c36d84a 100644 --- a/pkgs/tools/games/joystickwake/default.nix +++ b/pkgs/tools/games/joystickwake/default.nix @@ -1,13 +1,13 @@ { lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "joystickwake"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "foresto"; repo = pname; rev = "v${version}"; - sha256 = "0j8xwfmzzmc9s88zvzc3lv67821r6x28vy6vli3srvx859wprppd"; + sha256 = "1yhzv4gbz0c0ircxk91m1d4ygf14mla137z4nfxggmbvjs0aa4y0"; }; propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index 432c70231d0d..ca4f647dfa2d 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -5,11 +5,12 @@ stdenv.mkDerivation { pname = "pikchr"; - version = "unstable-2021-04-07"; + # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk + version = "unstable-2021-07-22"; src = fetchurl { - url = "https://pikchr.org/home/tarball/90b6d5b4a3834ff0/pikchr.tar.gz"; - sha256 = "1cqpnljy12gl82rcbb7mwhgv9szcliwkbwwh67hzdv020h1scxym"; + url = "https://pikchr.org/home/tarball/d9e1502ed74c6aab/pikchr.tar.gz"; + sha256 = "sha256-YSy95GiSodOS1YJgl9arBniqEJzYPrZ9CHNSCee9Yfg="; }; # can't open generated html files diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 0b2b03ba8db9..f22a7268fbc9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation (rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl); + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) + && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 47215a6dea6c..238bd9c4b0bc 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.10"; + version = "2.12"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-mjjFy6VItTg4VVXvGNjOJYHKHTy8o26iYsVC9Fq0YVg="; + sha256 = "sha256-+6U5BdLmdTaFzgZmjSH7rIL9JTwIX7bFkQqm0rNuTRY="; }; dontBuild = true; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 1d6cce633408..3250047e0e3d 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,21 +1,20 @@ { buildGoModule , fetchFromGitHub -, stdenv , lib }: buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.26.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; + sha256 = "sha256-iJL3EFoBtp4UOLm4/b4JBwzK6iZSTE0cb6EzmlziOLk="; }; - vendorSha256 = "sha256-sNI2OoDsSNtcQP8rNO4OCboFqSC7v6g4xEPNRKjv3sQ="; + vendorSha256 = "sha256-LNlglYys4F7+W7PUmBT9cBnYs7y6AlB9wdaDibaxqC0="; proxyVendor = true; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 485ce66dbd7c..9deb7d6c9409 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.2.1"; + version = "9.3.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEW20IbPVywNq2udfdQ/U71aDEku73+JGiy2iRADJ8Y="; + sha256 = "sha256-chSVAQXGtcAFs4GzqywjAUM9qng9j6j7KOrlQalxdOw="; }; - vendorSha256 = "sha256-z5G56PiBisceNc4tfZJVKh9tZmUkyamQBYG2mQ6kuXg="; + vendorSha256 = "sha256-z8xU1IH+xemx/kxE4crj90roF73QW5D9jFLpykH7meo="; doCheck = false; diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index ce490cafef6a..41e80a3e12cb 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.6.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-doJ1ceuJ/gL9vlGgV/hKIJeAErAseH0dtHKJX2z7pV0="; + sha256 = "sha256-8hyRuGKspWqv+uBeSz4i12Grl83EQVPWB1weEVf9yhA="; }; - vendorSha256 = "sha256-Y4WM+o+5jiwj8/99UyNHLpBNbtJkKteIGW2P1Jd9L6M="; + vendorSha256 = "sha256-YCZzIsu1mMAAjLGHISrDkfY4Lx0az2SZV8bnZOMalx8="; # Tests use network doCheck = false; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index 004a73475221..01e12e9fd58f 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "1gbj2jw7zv3mnq1lyj4q53jpfj642jy7lvg0kp060znvhws3370y"; + sha256 = "1kn2anp8abpi0n3p7j0yczbpy7mdhk8rv84ywyghqdvf2wjmnlnp"; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/tools/package-management/cargo-kcov/default.nix index c37a73063680..f94c4fa5c0f0 100644 --- a/pkgs/tools/package-management/cargo-kcov/default.nix +++ b/pkgs/tools/package-management/cargo-kcov/default.nix @@ -1,6 +1,8 @@ { lib , rustPlatform , fetchFromGitHub +, makeWrapper +, kcov }: rustPlatform.buildRustPackage rec { @@ -17,6 +19,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0m5gfyjzzwd8wkbb388vmd785dy334x0migq3ssi7dlah9zx62bj"; doCheck = false; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/cargo-kcov \ + --prefix PATH : ${lib.makeBinPath [ kcov ]} + ''; + meta = with lib; { description = "Cargo subcommand to run kcov to get coverage report on Linux"; homepage = "https://github.com/kennytm/cargo-kcov"; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix new file mode 100644 index 000000000000..6bd10614e9a1 --- /dev/null +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +, gawk +, git +, gnugrep +, installShellFiles +, jre +, makeWrapper +, unzip +}: + +stdenv.mkDerivation rec { + pname = "crowdin-cli"; + version = "3.6.4"; + + src = fetchurl { + url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; + sha256 = "123mv0s1jppidmwsvr8a6f8429xmpskxmnv4p8jpnfa9zrw86aaw"; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; + + installPhase = '' + runHook preInstall + + install -D crowdin-cli.jar $out/lib/crowdin-cli.jar + + installShellCompletion --cmd crowdin --bash ./crowdin_completion + + makeWrapper ${jre}/bin/java $out/bin/crowdin \ + --argv0 crowdin \ + --add-flags "-jar $out/lib/crowdin-cli.jar" \ + --prefix PATH : ${lib.makeBinPath [ gawk gnugrep git ]} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/crowdin/crowdin-cli/"; + description = "A command-line client for the Crowdin API"; + license = licenses.mit; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/tools/typesetting/lowdown/shared.patch b/pkgs/tools/typesetting/lowdown/shared.patch index ed9f266b3f9c..75ee03da9700 100644 --- a/pkgs/tools/typesetting/lowdown/shared.patch +++ b/pkgs/tools/typesetting/lowdown/shared.patch @@ -11,10 +11,11 @@ index 955f737..2c9532c 100644 www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 -@@ -101,6 +101,9 @@ lowdown-diff: lowdown +@@ -101,6 +101,10 @@ lowdown-diff: lowdown liblowdown.a: $(OBJS) $(COMPAT_OBJS) $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) ++%.o: CFLAGS += -fPIC +liblowdown.so: $(OBJS) $(COMPAT_OBJS) + $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5861d7533a6c..bb50e4d42e85 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -480,6 +480,20 @@ mapAliases ({ linuxPackages_xen_dom0_hardened = linuxPackages_hardened; linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; + # added 2021-08-16 + linuxPackages_latest_hardened = throw '' + The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches + frequently lag behind the upstream kernel. In some cases this meant that this attribute + had to refer to an older kernel[1] because the latest hardened kernel was EOL and + the latest supported kernel didn't have patches. + + If you want to use a hardened kernel, please check which kernel minors are supported + and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'. + + [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587 + ''; + linux_latest_hardened = linuxPackages_latest_hardened; + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96733ee14747..4161e8ee25c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1146,15 +1146,15 @@ with pkgs; arduino = arduino-core.override { withGui = true; }; - arduino-ci = callPackage ../development/arduino/arduino-ci { }; + arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; - arduino-cli = callPackage ../development/arduino/arduino-cli { }; + arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - arduino-core = callPackage ../development/arduino/arduino-core { }; + arduino-core = callPackage ../development/embedded/arduino/arduino-core { }; - arduino-mk = callPackage ../development/arduino/arduino-mk {}; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; - apio = python3Packages.callPackage ../development/tools/misc/apio { }; + apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; @@ -7641,7 +7641,7 @@ with pkgs; opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; - openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { }; + openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; openfortivpn = callPackage ../tools/networking/openfortivpn { }; @@ -8100,7 +8100,7 @@ with pkgs; plan9port = callPackage ../tools/system/plan9port { }; - platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); + platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -9445,7 +9445,7 @@ with pkgs; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; - tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyprog = callPackage ../development/embedded/fpga/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy { }; @@ -13003,7 +13003,7 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { + betaflight = callPackage ../development/embedded/stm32/betaflight { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13061,7 +13061,7 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { + inav = callPackage ../development/embedded/stm32/inav { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -13215,7 +13215,7 @@ with pkgs; automoc4 = callPackage ../development/tools/misc/automoc4 { }; - avrdude = callPackage ../development/tools/misc/avrdude { }; + avrdude = callPackage ../development/embedded/avrdude { }; b4 = callPackage ../development/tools/b4 { }; @@ -13369,13 +13369,13 @@ with pkgs; black-macchiato = with python3Packages; toPythonApplication black-macchiato; - blackmagic = callPackage ../development/tools/misc/blackmagic { }; + blackmagic = callPackage ../development/embedded/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/tools/misc/bossa { + bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; @@ -13403,7 +13403,7 @@ with pkgs; cbrowser = callPackage ../development/tools/misc/cbrowser { }; - cc-tool = callPackage ../development/tools/misc/cc-tool { }; + cc-tool = callPackage ../development/embedded/cc-tool { }; ccache = callPackage ../development/tools/misc/ccache { asciidoc = asciidoc-full; @@ -13628,7 +13628,7 @@ with pkgs; ddd = callPackage ../development/tools/misc/ddd { }; - lattice-diamond = callPackage ../development/tools/lattice-diamond { }; + lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { }; direvent = callPackage ../development/tools/misc/direvent { }; @@ -13689,7 +13689,7 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; - easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; @@ -13762,7 +13762,7 @@ with pkgs; fsearch = callPackage ../tools/misc/fsearch { }; - fujprog = callPackage ../development/tools/misc/fujprog { + fujprog = callPackage ../development/embedded/fpga/fujprog { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -13855,7 +13855,7 @@ with pkgs; gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; - gputils = callPackage ../development/tools/misc/gputils { }; + gputils = callPackage ../development/embedded/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -13883,6 +13883,8 @@ with pkgs; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; + crowdin-cli = callPackage ../tools/text/crowdin-cli { }; + gtranslator = callPackage ../tools/text/gtranslator { }; guff = callPackage ../tools/graphics/guff { }; @@ -13915,7 +13917,7 @@ with pkgs; iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; iaca = iaca_3_0; - icestorm = callPackage ../development/tools/icestorm { }; + icestorm = callPackage ../development/embedded/fpga/icestorm { }; icmake = callPackage ../development/tools/build-managers/icmake { }; @@ -13931,7 +13933,7 @@ with pkgs; indent = callPackage ../development/tools/misc/indent { }; - ino = callPackage ../development/arduino/ino { }; + ino = callPackage ../development/embedded/arduino/ino { }; inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; @@ -14180,7 +14182,7 @@ with pkgs; opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/embedded/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -14353,6 +14355,8 @@ with pkgs; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; + saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; sd-local = callPackage ../development/tools/sd-local { }; @@ -14471,9 +14475,9 @@ with pkgs; sselp = callPackage ../tools/X11/sselp{ }; - stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; - stm32flash = callPackage ../development/tools/misc/stm32flash { }; + stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; @@ -14528,7 +14532,7 @@ with pkgs; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; - teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; terracognita = callPackage ../development/tools/misc/terracognita { }; @@ -14573,7 +14577,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - trellis = callPackage ../development/tools/trellis { }; + trellis = callPackage ../development/embedded/fpga/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -14596,7 +14600,7 @@ with pkgs; boost = boost17x; }; - uisp = callPackage ../development/tools/misc/uisp { }; + uisp = callPackage ../development/embedded/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; @@ -14650,7 +14654,7 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xc3sprog = callPackage ../development/embedded/xc3sprog { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; @@ -14902,7 +14906,6 @@ with pkgs; boost160 boost165 boost166 - boost167 boost168 boost169 boost170 @@ -18459,7 +18462,7 @@ with pkgs; ronn = callPackage ../development/tools/ronn { }; - rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; rttr = callPackage ../development/libraries/rttr { }; @@ -21134,8 +21137,14 @@ with pkgs; # hardened kernels linuxPackages_hardened = linuxKernel.packages.linux_hardened; linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_latest_hardened = linuxKernel.packages.linux_latest_hardened; - linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_4_14_hardened = linuxKernel.packages.linux_4_14_hardened; + linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened; + linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + linuxPackages_5_4_hardened = linuxKernel.linux_5_4_hardened.linux_latest_hardened; + linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; + linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; @@ -23309,6 +23318,7 @@ with pkgs; comical = callPackage ../applications/graphics/comical { }; containerd = callPackage ../applications/virtualization/containerd { }; + containerd_1_4 = callPackage ../applications/virtualization/containerd/1.4.nix { }; convchain = callPackage ../tools/graphics/convchain {}; @@ -23479,8 +23489,8 @@ with pkgs; drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; @@ -23545,7 +23555,7 @@ with pkgs; jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { + ecpdap = callPackage ../development/embedded/fpga/ecpdap { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -25526,6 +25536,8 @@ with pkgs; xmrig = callPackage ../applications/misc/xmrig { }; + xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; + xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; @@ -27227,8 +27239,8 @@ with pkgs; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = thunderbird-bin-78; - thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; + thunderbird-bin = thunderbird-bin-91; + thunderbird-bin-91 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; ticpp = callPackage ../development/libraries/ticpp { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 86d451865957..85929255b186 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -137,13 +137,6 @@ let ]; }; - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -446,7 +439,6 @@ let linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); - linux_5_12 = recurseIntoAttrs (packagesFor kernels.linux_5_12); linux_5_13 = recurseIntoAttrs (packagesFor kernels.linux_5_13); }; @@ -472,9 +464,11 @@ let linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); - # Note: We use an explicit version instead of linux_latest since the hardened patches - # can lag behind and we don't want to delay updates. - linux_latest_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_12 { }); + + linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 { }); + linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { }); + linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); + linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7f51a0406d23..4361f2eccdaa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9,6 +9,7 @@ , stdenv, lib, buildPackages, pkgs , fetchurl, fetchgit, fetchpatch, fetchFromGitHub , perl, overrides, buildPerl, shortenPerlShebang +, nixosTests }: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above @@ -13721,6 +13722,12 @@ let url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; + + patches = [ + # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 + ../development/perl-modules/mod_perl2-PL_hash_seed.patch + ]; + makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; doCheck = false; # would try to start Apache HTTP server @@ -13728,6 +13735,8 @@ let description = "Embed a Perl interpreter in the Apache HTTP server"; license = lib.licenses.asl20; }; + + passthru.tests = nixosTests.mod_perl; }; Mojolicious = buildPerlPackage { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ba92d25afc7f..3f60f90e0804 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -49,6 +49,7 @@ mapAliases ({ glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 HAP-python = hap-python; # added 2021-06-01 lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c39b78bdf1c..f6fe67374fac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2784,6 +2784,8 @@ in { furl = callPackage ../development/python-modules/furl { }; + furo = callPackage ../development/python-modules/furo { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse; }; @@ -2997,6 +2999,8 @@ in { google-cloud-core = callPackage ../development/python-modules/google-cloud-core { }; + google-cloud-datacatalog = callPackage ../development/python-modules/google-cloud-datacatalog { }; + google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { }; google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { }; @@ -3164,7 +3168,7 @@ in { grip = callPackage ../development/python-modules/grip { }; - grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; + grpc-google-iam-v1 = callPackage ../development/python-modules/grpc-google-iam-v1 { }; grpcio = callPackage ../development/python-modules/grpcio { }; @@ -8481,6 +8485,8 @@ in { subliminal = callPackage ../development/python-modules/subliminal { }; + subprocess-tee = callPackage ../development/python-modules/subprocess-tee { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index b2e717fda67c..dc43bbec9d33 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -239,6 +239,8 @@ let gnu = lib.systems.parse.abis.musl; gnueabi = lib.systems.parse.abis.musleabi; gnueabihf = lib.systems.parse.abis.musleabihf; + musleabi = lib.systems.parse.abis.musleabi; + musleabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; };