From 3802c4962e54dd6110092a2ba3feee1d2ebf5a9e Mon Sep 17 00:00:00 2001 From: h0m1 Date: Tue, 19 Nov 2019 20:41:56 +0100 Subject: [PATCH 001/239] stage-1: create temporary secrets directory in /tmp and not in cwd --- nixos/modules/system/boot/stage-1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 4c2d130d5a5d..a3a76f2cd558 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -347,7 +347,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 From aa3a82886b6c61983821ce01b142e43aadd5e389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Sat, 29 Dec 2018 11:16:51 +0100 Subject: [PATCH 002/239] openvswitch: better integration with systemd Systemd dependencies for scripted mode were refactored according to analysis in #34586. networking.vswitches can now be used with systemd-networkd, although they are not supported by the daemon, a nixos receipe creates the switch and attached required interfaces (just like the scripted version). Vlans and internal interfaces are implemented following the template format i.e. each interface is described using an attributeSet (vlan and type at the moment). If vlan is present, then interface is added to the vswitch with given tag (access mode). Type internal enabled vswitch to create interfaces (see openvswitch docs). Added configuration for configuring supported openFlow version on the vswitch This commit is a split from the original PR #35127. --- nixos/modules/tasks/network-interfaces-systemd.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 23e1e611a71e..b14a3e93cc0c 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."; From ce76ecf505269c13c48b54be32bc5efdbb221fbf Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 9 Jun 2021 22:12:05 +0200 Subject: [PATCH 003/239] boost167: remove --- pkgs/development/libraries/boost/1.67.nix | 39 ----------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 40 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.67.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd04..445866b6ef8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14416,7 +14416,6 @@ in boost160 = callPackage ../development/libraries/boost/1.60.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; From 268e92bde00ab6aa3bbd81403125281f854e7185 Mon Sep 17 00:00:00 2001 From: Slim Cadoux Date: Sun, 18 Jul 2021 21:59:11 +0200 Subject: [PATCH 004/239] maintainers: add putchar --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ba85483ccd2..e33cf2d7c889 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8608,6 +8608,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"; From 090f33f788749b9d2a9105ff17d6e1e5ff36019b Mon Sep 17 00:00:00 2001 From: Iceman Date: Mon, 2 Aug 2021 14:35:41 -0400 Subject: [PATCH 005/239] nixos/geth: Change default to snap sync Starting in v1.10.4, go-ethereum changed the default sync mode to snap sync. This adds "snap" as one of valid types of syncmode and updates `services.geth.syncmode` to use it by default instead of the previous fast sync. --- nixos/modules/services/blockchain/ethereum/geth.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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."; }; From 871730254ea55aa1c43f7f2ea666b2a6ed5db946 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 5 Aug 2021 00:25:01 +0200 Subject: [PATCH 006/239] docker: 20.10.7 -> 20.10.8 docker-runc: 1.0.0-rc95 -> 1.0.1 docker-containerd: 1.5.1 -> 1.4.9 --- .../virtualization/docker/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ec358507c2d2..64684ffc0a28 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -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"; }; } From 0542f4e3b036b91fb4a697267544fcfb657480c5 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Mon, 9 Aug 2021 10:21:18 +1000 Subject: [PATCH 007/239] enchant: Add nuspell support --- pkgs/development/libraries/enchant/2.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index f2a4ae31346e..237ecf148cb8 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 = [ From 6f434ed48ce3ea9f5458bd58c81c68472a6103fb Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 3 Aug 2021 09:15:31 -0600 Subject: [PATCH 008/239] matrix-synapse: 1.39.0 -> 1.40.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 982ced37df4b..0b0133082ef3 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.39.0"; + version = "1.40.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dErfNHDUo0yGLbrRQdwbNkMVfnMfbrO3f7bsRwgRQMM="; + sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU="; }; patches = [ From 0ad7297beaf0b19f96e5068180072eb4f8a4b24f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 22:19:49 +0200 Subject: [PATCH 009/239] all-cabal-hashes: 2021-08-07T10:52:35Z -> 2021-08-10T19:15:27Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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" } From d143d589e78e14e6cb1cd8fac1cd2ea102ec10fd Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Aug 2021 22:21:42 +0200 Subject: [PATCH 010/239] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 654 +++++++++++++++--- 1 file changed, 548 insertions(+), 106 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8042c63fbc0e..72b6f88a9fb8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11589,8 +11589,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 +13766,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 ]; @@ -44686,19 +44686,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 +47593,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 +51170,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 +53874,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 +54391,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 +58705,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 +60189,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,14 +60555,17 @@ 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; }) {}; @@ -60533,6 +60595,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 +75002,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 +76409,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 +80518,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 +83418,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 +89690,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 +102838,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 +105803,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 +130429,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 +130440,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.22.1"; - sha256 = "0pj0xfjgcfskfm8cfay00jj0amya480846vcv65l2mw191svjb0i"; + version = "1.22.2"; + sha256 = "1g1v56fxgs7ya8yl22brwgrs49a50kd77k8ad8m8l5cnlnviqb3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130562,7 +130698,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 +130710,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 +130807,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 +130816,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 +130889,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 +130902,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.22.1"; - sha256 = "02ckw3012icz4hmbw7bdiclwwk2cqwrl3ds1f3w9i52lgwk5ncpd"; + version = "1.22.2"; + sha256 = "1ia11h2r6cl1985lij598qighxfhqfcv4am0nyfpvfihik14fq4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137198,14 +137334,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 +137349,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"; @@ -152851,6 +152987,25 @@ 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; + }) {}; + "jinquantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, quantities, regex-compat @@ -167135,6 +167290,45 @@ 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; + }) {}; + + "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; + }) {}; + "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 @@ -180238,6 +180432,47 @@ 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; + }) {GLEW = null;}; + "monomorphic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180528,8 +180763,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.15.0"; - sha256 = "174wdjcwkfks7cl3hapm342bf7dgvnfhn6ma6fgdvjd7cag5h8z9"; + version = "1.15.1"; + sha256 = "03r6p37b9hw9n0b143d38z07fjv05jnbw76s1fjx92rm2ybbgh3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180561,8 +180796,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 +181392,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 +195345,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 +202961,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 +203011,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 +203073,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 +203112,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 +203164,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 +209558,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 @@ -224257,6 +224578,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 +226544,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 +245322,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 +245790,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 = [ @@ -255112,7 +255505,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 +255514,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 +262206,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 +267460,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 ]; @@ -280813,6 +281217,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 +285232,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 From 0a44a61f39281de0942ebdf7e4b2dc22b46a51b9 Mon Sep 17 00:00:00 2001 From: Lisa Ugray Date: Tue, 10 Aug 2021 15:11:08 -0400 Subject: [PATCH 011/239] openssl-1.0.2u: Add patch for darwin64-arm64 openssl-1.0.2u doesn't have build flags for Apple's new arm chips --- .../libraries/openssl/1.0.2/darwin64-arm64.patch | 12 ++++++++++++ pkgs/development/libraries/openssl/default.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch 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." ]; }; From 2d1b5aa1fe72ef401a91e2e8408a939be5c1b238 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 11 Aug 2021 13:21:02 +0900 Subject: [PATCH 012/239] haskell.compiler.ghcHEAD: increase Hydra timeout because Darwin builds were timing out Building `haskell.compiler.ghcHEAD` on Hydra on Darwin seemed to cause frequent timeouts. Here's an example of a timeout: https://hydra.nixos.org/build/149762652 This commit raises the timeout time on Hydra for ghcHEAD. The other GHC derivations have this set, so it makes sense to set this here as well. --- pkgs/development/compilers/ghc/head.nix | 1 + 1 file changed, 1 insertion(+) 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; From 078285c64535f7c9a8f7f550fa80af9d15107553 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 10 Aug 2021 11:37:20 +0200 Subject: [PATCH 013/239] containerd_1_4: init at 1.4.9 --- .../virtualization/containerd/1.4.nix | 53 +++++++++++++++++++ .../virtualization/docker/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/virtualization/containerd/1.4.nix 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 64684ffc0a28..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; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7766eb1f26f..1bed1faeff3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23671,6 +23671,7 @@ in 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 {}; From e46127fb1c9df914010c28d1241a5ae69e891429 Mon Sep 17 00:00:00 2001 From: Slim Cadoux Date: Wed, 11 Aug 2021 17:06:58 +0200 Subject: [PATCH 014/239] python3Packages.subprocess-tee: init at 0.3.2 --- .../python-modules/subprocess-tee/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/subprocess-tee/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77256c8cc5e8..fcf36a7fe62a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8382,6 +8382,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; }; From 22f7e0839e6a944374da7fbd72d77ab28b9e3efd Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 11 Aug 2021 16:47:09 +0200 Subject: [PATCH 015/239] gusb: 0.3.5 -> 0.3.7 --- pkgs/development/libraries/gusb/default.nix | 13 ++++++++++--- .../libraries/gusb/fix-python-path.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/gusb/fix-python-path.patch 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: + From d2c9385b6bb0fd21c12f57f6581f2150fd3ccc88 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 11 Aug 2021 16:39:59 +0200 Subject: [PATCH 016/239] canon-cups-ufr2: deprecate phases --- pkgs/misc/cups/drivers/canon/default.nix | 31 +++++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) 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"; From 4444860f074e4530c25217a528748786f9334308 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 3 Aug 2021 09:44:06 -0600 Subject: [PATCH 017/239] matrix-synapse: fix homeserver script --- pkgs/servers/matrix-synapse/default.nix | 18 +++++++++++---- .../matrix-synapse/homeserver-script.patch | 23 ------------------- 2 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 pkgs/servers/matrix-synapse/homeserver-script.patch diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0b0133082ef3..2f9ceba4f562 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -19,11 +19,6 @@ buildPythonApplication rec { sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU="; }; - patches = [ - # adds an entry point for the service - ./homeserver-script.patch - ]; - buildInputs = [ openssl ]; propagatedBuildInputs = [ @@ -70,6 +65,19 @@ buildPythonApplication rec { PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; + postFixup = '' + mkdir -p $out/bin + + # Make a little wrapper for running Synapse with its dependencies + echo "#!/bin/sh + exec python -m synapse.app.homeserver \"\$@\" + " > $out/bin/homeserver + chmod +x $out/bin/homeserver + wrapProgram $out/bin/homeserver \ + --set PATH ${python3}/bin \ + --set PYTHONPATH $PYTHONPATH + ''; + passthru.tests = { inherit (nixosTests) matrix-synapse; }; passthru.plugins = plugins; passthru.tools = tools; 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 - From 957f0485dab604c493d7683b8a57c0679b19e35f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 05:30:46 +0000 Subject: [PATCH 018/239] linux_5_12: remove https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/ --- nixos/tests/kernel-generic.nix | 1 - .../linux/kernel/hardened/patches.json | 6 ------ pkgs/os-specific/linux/kernel/linux-5.12.nix | 20 ------------------- pkgs/top-level/all-packages.nix | 10 +--------- 4 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.12.nix diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index cd32049dff46..62d80db2915b 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,7 +31,6 @@ with pkgs; { linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; linux_testing = makeKernelTest "testing" linuxPackages_testing; 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cff389cf951b..dddc87f9a92c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21173,13 +21173,6 @@ with pkgs; ]; }; - 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 @@ -21503,7 +21496,6 @@ with pkgs; linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); # When adding to the list above: @@ -21537,7 +21529,7 @@ with pkgs; # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_12; + linux_latest_for_hardened = pkgs.linux_5_10; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { From 7cd5d178fc6fd403907bfe00f502337c162d7607 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 21:47:47 +0200 Subject: [PATCH 019/239] tools: replace name with pname&version --- pkgs/tools/admin/daemontools/default.nix | 9 +++++---- pkgs/tools/admin/tightvnc/default.nix | 7 ++++--- pkgs/tools/archivers/atool/default.nix | 8 +++++--- pkgs/tools/archivers/cabextract/default.nix | 5 +++-- pkgs/tools/archivers/cromfs/default.nix | 5 +++-- pkgs/tools/archivers/innoextract/default.nix | 5 +++-- pkgs/tools/archivers/pxattr/default.nix | 7 ++++--- pkgs/tools/audio/gvolicon/default.nix | 4 +++- pkgs/tools/audio/midicsv/default.nix | 5 +++-- pkgs/tools/audio/mpdsync/default.nix | 3 ++- pkgs/tools/audio/pa-applet/default.nix | 3 ++- pkgs/tools/audio/picotts/default.nix | 4 +++- pkgs/tools/backup/dirvish/default.nix | 6 ++++-- pkgs/tools/backup/mt-st/default.nix | 5 +++-- pkgs/tools/backup/mtx/default.nix | 5 +++-- pkgs/tools/backup/partimage/default.nix | 8 +++++--- pkgs/tools/backup/rsnapshot/default.nix | 5 +++-- pkgs/tools/bluetooth/obex-data-server/default.nix | 5 +++-- pkgs/tools/bluetooth/obexd/default.nix | 5 +++-- pkgs/tools/bluetooth/obexfs/default.nix | 5 +++-- pkgs/tools/bluetooth/obexftp/default.nix | 5 +++-- pkgs/tools/bluetooth/openobex/default.nix | 5 +++-- pkgs/tools/cd-dvd/ccd2iso/default.nix | 5 +++-- pkgs/tools/cd-dvd/cdrdao/default.nix | 7 ++++--- pkgs/tools/cd-dvd/cdrkit/default.nix | 5 +++-- pkgs/tools/cd-dvd/uif2iso/default.nix | 6 +++--- pkgs/tools/cd-dvd/vobcopy/default.nix | 5 +++-- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 9 ++++----- pkgs/tools/compression/lzham/default.nix | 7 ++++--- 29 files changed, 97 insertions(+), 66 deletions(-) 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/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"; }; From e670210728a841542aaa1519b93211d419375861 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Thu, 12 Aug 2021 16:40:27 -0400 Subject: [PATCH 020/239] pulumi-bin: 3.9.0 -> 3.10.0 --- pkgs/tools/admin/pulumi/data.nix | 82 +++++++++++++++---------------- pkgs/tools/admin/pulumi/update.sh | 20 ++++---- 2 files changed, 51 insertions(+), 51 deletions(-) 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" ) From 260d9cc7e10e477a60d11e9b44d80fd76a4492ae Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Aug 2021 22:50:29 +0200 Subject: [PATCH 021/239] nixos/testing: re-add nixos-run-vms script Originally removed in 926fb9396881202e727e5ec1fbf609b64455b388. This one is actually quite useful for `nixos-build-vms(8)`. --- nixos/lib/testing-python.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6369d6ef05d4..070a3a7ddc21 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -186,6 +186,12 @@ rec { --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ --set vlans '${toString vlans}' + + 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 From e1ec5acd3137d3af247f9a938d9cc086d8111377 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Aug 2021 23:01:03 +0200 Subject: [PATCH 022/239] nixos/test-driver: start interactive mode if `testScript` is empty This is relevant for `nixos-build-vms(8)` which doesn't have a test-script. In that case it's more intuitive to directly go into the interactive mode which is IMHO more intuitive. --- nixos/lib/test-driver/test-driver.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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)) From 327f53d8ea96c3b580140b66ab9a6632add611df Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 23:55:12 +0200 Subject: [PATCH 023/239] whirlpool-gui: deprecate phases --- pkgs/applications/blockchains/whirlpool-gui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0fbf6afa4d8ddec6f637a3f0f363f7c3ef3b4c12 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 13 Aug 2021 14:49:39 +0900 Subject: [PATCH 024/239] thunderbird-bin: 78.13.0 -> 91.0 --- .../thunderbird-bin/release_sources.nix | 544 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 269 insertions(+), 279 deletions(-) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9de8b6ea03b..c5c23786e5c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27662,8 +27662,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 { }; From 9261db9db4f3f333897ad6a0152811054c4ae25e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 13 Aug 2021 09:07:56 +0000 Subject: [PATCH 025/239] cargo-kcov: ensure kcov is in PATH The tool is non-functional without this. --- pkgs/tools/package-management/cargo-kcov/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) 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"; From c4095d0e4129dd7914a885a0f4088b2ff8f0b2c5 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 13 Aug 2021 15:10:35 +0200 Subject: [PATCH 026/239] perlPackages.mod_perl2: fix build on perl-5.34.0 --- .../perl-modules/mod_perl2-PL_hash_seed.patch | 13 +++++++++++++ .../http/apache-modules/mod_perl/default.nix | 5 +++++ pkgs/top-level/perl-packages.nix | 6 ++++++ 3 files changed, 24 insertions(+) create mode 100644 pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch 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/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index 2762f636f592..febbaf768b71 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -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 \ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 93e7acff553d..90938b265bb7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13678,6 +13678,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 From e5b6d371bea52f1602298279881abbd28a80d251 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 15:00:09 +0000 Subject: [PATCH 027/239] python38Packages.azure-servicebus: 7.3.1 -> 7.3.2 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 1ba3f7927f9a8a982994ff6bdf1adc3949812128 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 13 Aug 2021 17:35:30 +0200 Subject: [PATCH 028/239] nixos/testing: only create `nixos-run-vms` for `nixos-build-vms(8)` This is the case when the test-script is empty. `nixos-build-vms(8)` is primarily supposed to be used as tool to test changes or to reproduce bugs (IMHO) where "just spinning up a few VMs" is the primary use-case. In the ongoing discussion about these changes[1] it was suggested to only expose it when needed (i.e. in the case I described above) to keep the API surface as slim as possible. [1] https://github.com/NixOS/nixpkgs/pull/133675#discussion_r688112485 --- nixos/lib/testing-python.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 070a3a7ddc21..e95ebe16ecac 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -187,11 +187,13 @@ rec { --set testScript "$out/test-script" \ --set vlans '${toString vlans}' - 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}' + ${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 From 6c38bb6d5d34b53bd98cfa6936a1d56c43368782 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Fri, 13 Aug 2021 17:42:27 +0100 Subject: [PATCH 029/239] kubernetes: fix breakage introduced by upgrade to 1.22 --- .../manual/from_md/release-notes/rl-2111.section.xml | 12 +++++++----- nixos/doc/manual/release-notes/rl-2111.section.md | 3 ++- .../services/cluster/kubernetes/apiserver.nix | 7 ------- .../modules/services/cluster/kubernetes/flannel.nix | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) 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 8504593e7683..f88be3918795 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,13 @@ 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. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 024ed9c73998..b7cb31883f67 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,8 @@ 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. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/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 = { From 5e13c58f78b685f1d9fd451160dfb1adc9c4ce07 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 13 Aug 2021 20:55:15 +0200 Subject: [PATCH 030/239] nixos/mod_perl: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/mod_perl.nix | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 nixos/tests/mod_perl.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7e657878509c..450b65b8b667 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -255,6 +255,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/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" + ''; +}) From d7ae8cf1fed9604736ed4b5fe87859a930b68e48 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 14 Aug 2021 07:02:43 +0200 Subject: [PATCH 031/239] =?UTF-8?q?factorio:=201.1.36=20=E2=86=92=201.1.37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/games/factorio/versions.json | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) 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" } } } From 1bf40576bc6aa03bdeecbc86daedcb31177b418c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 06:08:13 +0000 Subject: [PATCH 032/239] xplayer: 2.4.0 -> 2.4.2 --- pkgs/applications/video/xplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From d1434fd8960cce9afcbf545e34c80dde5c2b8e6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 06:24:20 +0000 Subject: [PATCH 033/239] wireless-regdb: 2021.04.21 -> 2021.07.14 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From f06fee4262571c4a09871c1fb5d511e6f5b02d9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 07:10:30 +0000 Subject: [PATCH 034/239] wtf: 0.36.0 -> 0.38.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From e6e0adacca4e652d1ca48fa1a5e2a406b026faea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 09:50:35 +0000 Subject: [PATCH 035/239] cinnamon.xviewer: 2.8.3 -> 3.0.2 --- pkgs/desktops/cinnamon/xviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From b1af5179bcb4eea65be050a6233492e3e0c355ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 09:55:31 +0000 Subject: [PATCH 036/239] cinnamon.xapps: 2.0.6 -> 2.2.3 --- pkgs/desktops/cinnamon/xapps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From c0053ee33031801a2bcc285be4fd2a371f98d709 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:09:40 +0000 Subject: [PATCH 037/239] istioctl: 1.10.3 -> 1.11.0 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From caf714998277a47003692dce701585a3c46dce6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 10:29:05 +0000 Subject: [PATCH 038/239] joystickwake: 0.2.4 -> 0.2.5 --- pkgs/tools/games/joystickwake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From dca4f328194d8778b9b58adde2ab07e82d3fd596 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 11 Aug 2021 22:35:27 +0100 Subject: [PATCH 039/239] graphene-hardened-malloc: 2 -> 8 significantly overhaul tests to cover build-time-linking and LD_PRELOAD use, simplifying the hardened nixos test to allow it to reuse this test setup. --- nixos/tests/hardened.nix | 28 +------ .../graphene-hardened-malloc/default.nix | 77 +++++++++++++------ 2 files changed, 56 insertions(+), 49 deletions(-) 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/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" ]; }; -} +}) From 70cba6232567692b01816f1f4830105393483b5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 11:18:05 +0000 Subject: [PATCH 040/239] xterm: 367 -> 368 --- pkgs/applications/terminal-emulators/xterm/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 From 1c244c9d71e1a00017f86fc4ff22a7e379cd80a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 17:01:46 +0000 Subject: [PATCH 041/239] uftrace: 0.9.4 -> 0.10 --- pkgs/development/tools/uftrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 66d1cb3c4df2974ed94cf57e6deb6cf57b7621ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 03:11:04 +0000 Subject: [PATCH 042/239] dasel: 1.18.0 -> 1.19.0 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}" From 24aaa059bc017a523b8955e8f950421092e42a57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 07:24:14 +0000 Subject: [PATCH 043/239] python38Packages.fastecdsa: 2.1.5 -> 2.2.1 --- pkgs/development/python-modules/fastecdsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d857340c8e16a1c080832bbf3566c86fc718c1cf Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Aug 2021 15:35:18 +0200 Subject: [PATCH 044/239] nixos/installer: simplify and document wifi setup The wpa_supplicant service in the NixOS installer is unusable because the control socket is disabled and /etc/wpa_supplicant.conf ignored. The manual currently recommends manually starting the daemon and using wpa_passphrase, but this requires figuring out the interface name, driver and only works for WPA2 personal networks. By enabling the control socket, instead, a user can configure the network via wpa_cli (or wpa_gui in the graphical installer), which support more advanced network configurations. --- nixos/doc/manual/installation/installing.xml | 47 +++++++++++++++++-- .../modules/profiles/installation-device.nix | 6 +++ 2 files changed, 48 insertions(+), 5 deletions(-) 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/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. From 3ff768534f10049a52c58fed3ed9cbf1789fbec4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 11:32:59 +0000 Subject: [PATCH 045/239] mustache-go: 1.2.0 -> 1.2.2 --- pkgs/development/tools/mustache-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From 13b620376cf042b8ad966f43fde6f2ebfbaedb08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:37:57 +0200 Subject: [PATCH 046/239] python3Packages.google-api-python-client: 2.9.0 -> 2.15.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 5f2d1bf8d93e2047a5ff6c99f4b9a70a50250602 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:37:58 +0200 Subject: [PATCH 047/239] python3Packages.google-auth-oauthlib: 0.4.4 -> 0.4.5 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 76d50ba35a7d1fe4cefc3a833d56c633701d5634 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:00 +0200 Subject: [PATCH 048/239] python3Packages.google-auth: 1.31.0 -> 1.34.0 --- pkgs/development/python-modules/google-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From f22452b8e8022c4ba276bf4459ef86bce1c95514 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:02 +0200 Subject: [PATCH 049/239] python3Packages.google-resumable-media: 1.3.1 -> 1.3.3 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 97ed018f9f5e67439c414b1b42ffc40d2ccaa545 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:05 +0200 Subject: [PATCH 050/239] python3Packages.proto-plus: 1.18.1 -> 1.19.0 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From cdf773c87c761fa992dec571f24daf60089daca9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:07 +0200 Subject: [PATCH 051/239] python3Packages.google-cloud-asset: 2.2.0 -> 3.3.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 61e69c5b29da..425d6c007bb3 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -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 = '' From 17a421e1aa30b3373fb4fbe348409375783bc409 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:09 +0200 Subject: [PATCH 052/239] python3Packages.google-cloud-automl: 2.3.0 -> 2.4.2 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 91cd0b0e8e681c91f73754c7d9415aa3fb3819a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:11 +0200 Subject: [PATCH 053/239] python3Packages.google-cloud-bigquery: 2.20.0 -> 2.23.3 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index acb66394bd4a..76b43b9e993f 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,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 = [ From 6e02278fc92ae9061fd2b3446fc9b248de6a6af1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:13 +0200 Subject: [PATCH 054/239] python3Packages.google-cloud-bigquery-datatransfer: 3.1.1 -> 3.3.1 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 2841a1c3ef08c71a803a54f45b46acabea5a020c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:15 +0200 Subject: [PATCH 055/239] python3Packages.google-cloud-bigquery-logging: 0.1.0 -> 0.2.1 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..de4e987a27ad 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -12,11 +12,11 @@ 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 = [ From 394634b152ee1073be8d76ad24ad38518e021ad3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:17 +0200 Subject: [PATCH 056/239] python3Packages.google-cloud-bigtable: 2.2.0 -> 2.3.3 --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index f7eb9a51a8a3..1fa5388a2e42 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -12,11 +12,11 @@ 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 = [ From 251b1c74786b740348fedc4b28a049c348af6968 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:19 +0200 Subject: [PATCH 057/239] python3Packages.google-cloud-container: 2.4.1 -> 2.7.1 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 095e0a84479e..7207d1c1e980 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ 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 ]; From f2147a5cd35a84f0e8461f8cdceab23d26206db6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:21 +0200 Subject: [PATCH 058/239] python3Packages.google-cloud-core: 1.7.0 -> 1.7.2 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 62dabcbcb3eee1496dfd9abf8d9fb64b3de89df8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:23 +0200 Subject: [PATCH 059/239] python3Packages.google-cloud-dataproc: 2.4.0 -> 2.5.0 --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From e4d016b4859c72b7d0fb8acbafbb74b1fe3fc3dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:25 +0200 Subject: [PATCH 060/239] python3Packages.google-cloud-datastore: 2.1.3 -> 2.1.6 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 06f7d4c1d084691fa61fe6028809929763dfd1b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:27 +0200 Subject: [PATCH 061/239] python3Packages.google-cloud-dlp: 3.1.1 -> 3.2.2 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d8d554cba93e4dc95d383dd5c67f27493e1420e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:29 +0200 Subject: [PATCH 062/239] python3Packages.google-cloud-dns: 0.32.3 -> 0.33.0 --- pkgs/development/python-modules/google-cloud-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 240e1ccfd45cdd3993d58cf31d25e65d1dfc5286 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:31 +0200 Subject: [PATCH 063/239] python3Packages.google-cloud-error-reporting: 1.1.2 -> 1.2.2 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From f79e6c138d4c5eb44907dc137621f40e30a2b036 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:33 +0200 Subject: [PATCH 064/239] python3Packages.google-cloud-firestore: 2.1.3 -> 2.2.0 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 7ccfffb04e581ca0c3f2cbaa290b5b9e950ab8b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:35 +0200 Subject: [PATCH 065/239] python3Packages.google-cloud-iam-logging: 0.1.0 -> 0.1.2 --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..1dbf6f224c5b 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,11 +12,11 @@ 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 = [ From c55f040e4093ceb94567ae14acdf4522e29663ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:37 +0200 Subject: [PATCH 066/239] python3Packages.google-cloud-iot: 2.1.0 -> 2.2.1 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 5fc87b31c306..bdda73c562a2 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ 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 ]; From eb7de7a5ab764330554707959398e5773ca80f16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:39 +0200 Subject: [PATCH 067/239] python3Packages.google-cloud-kms: 2.3.0 -> 2.5.0 --- pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 1caf22bdd27a..ed62318fb54f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ 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 ]; From cb9945f408ba594ce7b01f56c688cbfe60075588 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:41 +0200 Subject: [PATCH 068/239] python3Packages.google-cloud-language: 2.1.0 -> 2.2.2 --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 466250270e7881be4e7d76fe87cba8e8aacf1045 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:43 +0200 Subject: [PATCH 069/239] python3Packages.google-cloud-logging: 2.5.0 -> 2.6.0 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 11f99457ae217fb5347e63736e66ee86bb8575f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:45 +0200 Subject: [PATCH 070/239] python3Packages.google-cloud-monitoring: 2.3.0 -> 2.4.2 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 14224e3e88d0a7309f758bcf4f899ae51d092b0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:47 +0200 Subject: [PATCH 071/239] python3Packages.google-cloud-os-config: 1.2.0 -> 1.3.2 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From dbe7f11e84120ec6ac1f2827ee8becf33fb8cf0d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:49 +0200 Subject: [PATCH 072/239] python3Packages.google-cloud-pubsub: 2.5.0 -> 2.7.0 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index f0615bd5a21b..17908b907177 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,11 +13,11 @@ 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 = [ From 96d64192e6d17137df1b298cad5f401a6c5fff1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:51 +0200 Subject: [PATCH 073/239] python3Packages.google-cloud-redis: 2.1.1 -> 2.2.2 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 02a9832fa2dfa249f55170d7ec572beda50a4757 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:53 +0200 Subject: [PATCH 074/239] python3Packages.google-cloud-resource-manager: 0.30.3 -> 1.0.2 --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..74c692d89060 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -9,11 +9,11 @@ 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 ]; From 920f244b53ae0b055e26c169f582a95e67ef18ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:56 +0200 Subject: [PATCH 075/239] python3Packages.google-cloud-runtimeconfig: 0.32.2 -> 0.32.3 --- .../python-modules/google-cloud-runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 682043fd31b8330cbd1956e237a4bf7715576b1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:38:58 +0200 Subject: [PATCH 076/239] python3Packages.google-cloud-secret-manager: 2.5.0 -> 2.7.0 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..2b4822d9de33 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ 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 = [ From 3f1faa519895ea6d4478419577afa919c13e30fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:01 +0200 Subject: [PATCH 077/239] python3Packages.google-cloud-securitycenter: 1.3.1 -> 1.5.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index cc83868079f2..56dcb29ef45d 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ 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 ]; From 97ca9a433a6c1853a33045a4574de44ef1c06319 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:03 +0200 Subject: [PATCH 078/239] python3Packages.google-cloud-spanner: 3.5.0 -> 3.7.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 17fe6be97176..d8f37d65b37f 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ 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 = [ From a5f2209a20aeb2de26187dbda61d2690596817f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:05 +0200 Subject: [PATCH 079/239] python3Packages.google-cloud-speech: 2.4.0 -> 2.6.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From c0a0401e8aaff0ea60dd89bd4c7de482e4456333 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:08 +0200 Subject: [PATCH 080/239] python3Packages.google-cloud-storage: 1.38.0 -> 1.41.1 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 037e96c0e735..c718849ba140 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 = [ From c2539a557c540c83526e197bc8adc5e715caa9bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:10 +0200 Subject: [PATCH 081/239] python3Packages.google-cloud-tasks: 2.3.0 -> 2.5.1 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 420aacb1e4b9..06970ed2b9dc 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ 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 ]; From 16c0db3213cf4d422c84618d958dba09dd704844 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:13 +0200 Subject: [PATCH 082/239] python3Packages.google-cloud-testutils: 0.2.0 -> 1.0.0 --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 4122aeb574bea791a21aa19a39cce44d4ab49212 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:15 +0200 Subject: [PATCH 083/239] python3Packages.google-cloud-texttospeech: 2.4.0 -> 2.5.2 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 80687d267bb7aef4ec4854e224ac1793c5da009a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:18 +0200 Subject: [PATCH 084/239] python3Packages.google-cloud-trace: 1.2.0 -> 1.3.2 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d128600a146088ffd6f89b3941b9cf1caafae8e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:20 +0200 Subject: [PATCH 085/239] python3Packages.google-cloud-translate: 3.2.0 -> 3.3.2 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 0aa06dd238fcfa7dc5726011a72e894559590e2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:23 +0200 Subject: [PATCH 086/239] python3Packages.google-cloud-videointelligence: 2.2.0 -> 2.3.2 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 61514be7dccd9c9e487bebf449a7bad25e2349eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:25 +0200 Subject: [PATCH 087/239] python3Packages.google-cloud-vision: 2.3.2 -> 2.4.2 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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]; From 005c8088e1c8af388d20f5abc21f227cd621825a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:27 +0200 Subject: [PATCH 088/239] python3Packages.google-cloud-websecurityscanner: 1.3.0 -> 1.4.1 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 5dfb052ee4a098efee226b05dbec8b338c6c5c94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Aug 2021 23:39:30 +0200 Subject: [PATCH 089/239] python3Packages.google-cloud-appengine-logging: 0.1.0 -> 0.1.4 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..b195bc2ad6e9 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,11 +12,11 @@ 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 = [ From 0be2c36a4aff742ad8b8baf6bd0ffbb47216ce48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 15 Aug 2021 09:49:10 -0300 Subject: [PATCH 090/239] marwaita-manjaro: 2.0 -> 10.3 --- pkgs/data/themes/marwaita-manjaro/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 = [ From 225d62caec46adf2511e2979b6566919a5644e00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 14:50:05 +0200 Subject: [PATCH 091/239] python3Packages.pyppeteer: 0.2.5 -> 0.2.6 --- .../python-modules/pyppeteer/default.nix | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) 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" From 0d79c10f2eb16288fa042fbef171893411186723 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 15 Aug 2021 15:10:42 +0200 Subject: [PATCH 092/239] python3Packages.desktop-notifier: 3.3.0 -> 3.3.1 Switched to GitHub fetcher because Pypi doesn't supply required resources in their tarball. --- .../python-modules/desktop-notifier/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 = [ From 6d6f1cc6acd3c0fda1e0d6655ba41ad8312e12f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 13:23:45 +0000 Subject: [PATCH 093/239] oapi-codegen: 1.6.0 -> 1.8.2 --- pkgs/tools/networking/oapi-codegen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From b40971db7fc3431661cb8f8238051289ebebc33d Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Fri, 13 Aug 2021 18:55:06 +0200 Subject: [PATCH 094/239] ballerburg: include desktop file and icon --- pkgs/games/ballerburg/default.nix | 36 ++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) 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 = '' From 14b7ad41b54395a9ec4204e84400ff125b12eb27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 13:29:15 +0000 Subject: [PATCH 095/239] obsidian: 0.12.3 -> 0.12.12 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 5937fc0f8c4cb45f5458a48b3ed987bd8062bf75 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Aug 2021 23:00:21 +0200 Subject: [PATCH 096/239] misc: replace name with pname&version --- .../cups/drivers/brgenml1cupswrapper/default.nix | 5 +++-- pkgs/misc/cups/drivers/brgenml1lpr/default.nix | 5 +++-- pkgs/misc/cups/drivers/cups-bjnp/default.nix | 5 +++-- pkgs/misc/cups/drivers/splix/default.nix | 9 +++++---- .../epson-workforce-635-nx625-series/default.nix | 12 ++++++------ pkgs/misc/drivers/foomatic-filters/default.nix | 5 +++-- pkgs/misc/drivers/gutenprint/default.nix | 5 +++-- pkgs/misc/drivers/m33-linux/default.nix | 3 ++- pkgs/misc/drivers/xwiimote/default.nix | 6 ++++-- pkgs/misc/emulators/bsod/default.nix | 7 ++++--- pkgs/misc/emulators/dosbox/default.nix | 5 +++-- pkgs/misc/emulators/fakenes/default.nix | 8 +++++--- pkgs/misc/emulators/gens-gs/default.nix | 7 ++++--- pkgs/misc/emulators/uae/default.nix | 5 +++-- pkgs/misc/emulators/vice/default.nix | 5 +++-- pkgs/misc/emulators/wxmupen64plus/default.nix | 8 +++++--- pkgs/misc/emulators/zsnes/default.nix | 3 ++- pkgs/misc/screensavers/slock/default.nix | 5 +++-- pkgs/misc/screensavers/vlock/default.nix | 11 ++++++----- pkgs/misc/screensavers/xlockmore/default.nix | 5 +++-- pkgs/misc/screensavers/xss-lock/default.nix | 3 ++- pkgs/misc/screensavers/xtrlock-pam/default.nix | 3 ++- pkgs/misc/solfege/default.nix | 5 +++-- 23 files changed, 80 insertions(+), 55 deletions(-) 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/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"; }; From 4e2ec502f7978dc3fc1070960f5d65b5c4688538 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 16:42:53 +0000 Subject: [PATCH 097/239] opentelemetry-collector: 0.26.0 -> 0.31.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 1d6cce633408..ccdd7ecb0d32 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -6,16 +6,16 @@ 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" ]; From 4f489fa6ed1ca245324a974b965075ef343a0ead Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 18:49:07 +0200 Subject: [PATCH 098/239] python3Packages.aiomusiccast: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/aiomusiccast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From fa59f712180256c4ba3b5937a252d37242e2c58e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 16:51:03 +0000 Subject: [PATCH 099/239] openxr-loader: 1.0.14 -> 1.0.18 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From cf5bad503c391b2669aa4d059737f58c756296c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 18:54:26 +0200 Subject: [PATCH 100/239] python3Packages.apprise: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 012a9df9a17e056ebb9b861554814cb6c046a932 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 18:57:43 +0200 Subject: [PATCH 101/239] python3Packages.smart-meter-texas: 0.4.3 -> 0.4.4 --- pkgs/development/python-modules/smart-meter-texas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 3f1cb5c13e277e6875ad33cc51b361be60bad5c0 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 20:00:31 +0300 Subject: [PATCH 102/239] nsd: 4.3.5 -> 4.3.7 --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 1e481a0061fd644313dcfeb8592b0d4f4e2ee42b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 19:05:07 +0200 Subject: [PATCH 103/239] python3Packages.spotipy: 2.18.0 -> 2.19.0 --- pkgs/development/python-modules/spotipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 6604a19d527af585454a35897009169b35698065 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 15 Aug 2021 13:09:24 -0400 Subject: [PATCH 104/239] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ca33df47d49b..6704b8d6a79d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3556,8 +3556,8 @@ final: prev: src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "fcd3964ff7e28b7b441942ecf4f0c9d22d5b7bc9"; - sha256 = "0zkb5sfchqc91w6gacb3c43cm2n4wxjp1npzslrl4n1x4bsddz5l"; + rev = "f5dc246c2edfd237ebcb0288250a18771019e810"; + sha256 = "1mm89m7lfcrw2hxqbpnvxv610wl5lvinslb8m26j2xrpv0k2qnzb"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3828,12 +3828,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-14"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cf0c25e372a6ee26f8a4254d6adb34021fec1a4c"; - sha256 = "1g678y71dmzmd7mfa26mj5blszq41shkbjdc87p1ydj1aq918s17"; + rev = "b4661ec91e4675a339289d5662a93e646aeabe6f"; + sha256 = "1ax327j9p2bjrwni24s9ymp1zjhq5b1h5znxb4myjmh29q5x0pgm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3912,12 +3912,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 +4333,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/"; }; From ff93bb9b2947145d31aabece0f8b0ab3ac720d37 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 15 Aug 2021 13:09:43 -0400 Subject: [PATCH 105/239] vimPlugins.refactoring-nvim: init at 2021-08-15 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6704b8d6a79d..caa79fa787b0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4523,6 +4523,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; + refactoring-nvim = buildVimPluginFrom2Nix { + pname = "refactoring-nvim"; + version = "2021-08-15"; + src = fetchFromGitHub { + owner = "theprimeagen"; + repo = "refactoring.nvim"; + rev = "48eeaf96bd78087dbf1df220fa6bf3e81906a481"; + sha256 = "1h6vgw25fi7ar9gk8b1a5v61lc26myf7rr82hg2vfdrif4w9qgzq"; + }; + meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; + }; + registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; version = "2021-08-11"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a5ec30daa711..4122e45250fd 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -457,6 +457,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; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cbd457cf4bf7..b55e9680a2c7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -681,6 +681,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 From 59e806a7c2ce5972678a88ce33ff5de0c053847d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 19:13:41 +0200 Subject: [PATCH 106/239] python3Packages.rokuecp: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 54dfcbf48ced466da46babe99a2beed4984d1a54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 21:21:57 +0200 Subject: [PATCH 107/239] python3Packages.locationsharinglib: 4.1.6 -> 4.1.8 --- .../python-modules/locationsharinglib/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 = '' From ae41d2a1d7a669a2950c658003fd60e11c4781f1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 15 Aug 2021 22:28:37 +0300 Subject: [PATCH 108/239] =?UTF-8?q?xdotool:=203.20160805.1=20=E2=86=92=203?= =?UTF-8?q?.20210804.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/X11/xdotool/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 From fcc699a051598d1f4e7a11a4281159dae91ebb9e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 8 Aug 2021 20:31:30 +0200 Subject: [PATCH 109/239] crowdin-cli: init at 3.6.4 --- pkgs/tools/text/crowdin-cli/default.nix | 45 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/text/crowdin-cli/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c22f05c298e..43d80a659664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 672f45b30ceccf29650f70f772037a6926e3286f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 15 Aug 2021 22:25:40 +0200 Subject: [PATCH 110/239] apacheHttpdPackages.mod_perl: add passthru test --- pkgs/servers/http/apache-modules/mod_perl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index febbaf768b71..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"; @@ -28,4 +28,6 @@ stdenv.mkDerivation rec { mv $out${perl}/* $out rm $out/nix -rf ''; + + passthru.tests = nixosTests.mod_perl; } From 63ad6eb8a1603afd528b89cbd1519b353d42e537 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 15 Aug 2021 22:26:50 +0200 Subject: [PATCH 111/239] perlPackages.mod_perl2: add passthru test --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 90938b265bb7..06d5803ccebc 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 @@ -13691,6 +13692,8 @@ let description = "Embed a Perl interpreter in the Apache HTTP server"; license = lib.licenses.asl20; }; + + passthru.tests = nixosTests.mod_perl; }; Mojolicious = buildPerlPackage { From 671dfb2fd94a5da7ffafa7c1f3e10fa424af3dde Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 15 Aug 2021 14:07:02 -0700 Subject: [PATCH 112/239] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 66 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ca33df47d49b..a9d6a043f3f5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -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/"; }; @@ -2680,8 +2680,8 @@ final: prev: src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "a4a53a40eae92d9974efc5aaa73a628ff767cf06"; - sha256 = "1080wrf19vvjjfjkcag27rncic38lzl19vp6jxgr8vi5jppmnfd6"; + rev = "d6edfefa60b067246e8007cbaa213f3a4f59d8ef"; + sha256 = "0bw20bzh9z3r8fd4dd9ffrllk931g0nj26n91rrqq1pmx983i4ym"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2772,12 +2772,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 +2820,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/"; }; @@ -3556,8 +3556,8 @@ final: prev: src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "fcd3964ff7e28b7b441942ecf4f0c9d22d5b7bc9"; - sha256 = "0zkb5sfchqc91w6gacb3c43cm2n4wxjp1npzslrl4n1x4bsddz5l"; + rev = "f5dc246c2edfd237ebcb0288250a18771019e810"; + sha256 = "1mm89m7lfcrw2hxqbpnvxv610wl5lvinslb8m26j2xrpv0k2qnzb"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3828,12 +3828,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-14"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cf0c25e372a6ee26f8a4254d6adb34021fec1a4c"; - sha256 = "1g678y71dmzmd7mfa26mj5blszq41shkbjdc87p1ydj1aq918s17"; + rev = "b4661ec91e4675a339289d5662a93e646aeabe6f"; + sha256 = "1ax327j9p2bjrwni24s9ymp1zjhq5b1h5znxb4myjmh29q5x0pgm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3912,12 +3912,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 +4333,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/"; }; @@ -4621,12 +4621,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/"; }; @@ -7905,12 +7905,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/"; }; @@ -9903,8 +9903,8 @@ final: prev: src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "539742fdd56d13ada0aa3e9b0ab8690ca49b853f"; - sha256 = "03q6c2mb7gkhfzw6bjl77jsxffr3kb0vcj9ky80c6wmpi3vzmb1k"; + rev = "6302a3db7e1fbf691feac65f3f1b2f031653c81f"; + sha256 = "03xag1nqv6l26hw53pb707g6amqaq7kpa72wa7nmps41nxbgswdn"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10019,12 +10019,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-14"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "fda3866f6b61961fbcd723ed83a61af29e272a3c"; - sha256 = "0cfv0x6sg2rap82p22kpkn8q8jdv6ixnk2dizgk3nqpdhq235h48"; + rev = "4d272abddc0d86e0b25ead5620ed150b96139b06"; + sha256 = "074yipfzy5ca4hlds3gpls31ms5js2zbx458km3svii8zs80kszr"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; From e3344c5ddca9716226fd1bb4220413612b7ced01 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 15 Aug 2021 14:08:05 -0700 Subject: [PATCH 113/239] vimPlugins.vim-ReplaceWithRegister: init at 2021-07-05 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a9d6a043f3f5..018756e7137c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8683,6 +8683,18 @@ 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-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; version = "2021-07-16"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cbd457cf4bf7..4acf2f6694ab 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -224,6 +224,7 @@ ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim Inazuma110/deoplete-greek +inkarkat/vim-ReplaceWithRegister inkarkat/vim-SyntaxRange int3/vim-extradite Iron-E/nvim-highlite From 2ae15bde0a32ce47b981f6cea3df82419c29ab93 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 15 Aug 2021 14:10:44 -0700 Subject: [PATCH 114/239] vimPlugins.vim-ReplaceWithSameIndentRegister: init at 2020-06-17 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 018756e7137c..565ad737d566 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -8695,6 +8695,18 @@ final: prev: 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"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4acf2f6694ab..dbe060f78654 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -225,6 +225,7 @@ 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 From 48a47c969a69e69ebc19f68c0d1dcbde1feca9cb Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 16 Aug 2021 08:53:24 +0530 Subject: [PATCH 115/239] pounce: 2.3 -> 2.4 --- pkgs/servers/pounce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From d6fb49d8c297eebefab57e76105f9d68bef40221 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 15 Aug 2021 18:36:49 -0700 Subject: [PATCH 116/239] qview: fix build on darwin, support extra formats Clarified license to GPL3+. Building on darwin requires qtsvg. qtimageformats adds support for extra image formats, such as WebP. --- pkgs/applications/graphics/qview/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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; }; From 569a0b60635ef0c5017d5fce188af9b947a38b80 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 14 Aug 2021 18:10:08 +0300 Subject: [PATCH 117/239] arpa2cm: 0.5 -> 0.9.0 --- .../tools/build-managers/arpa2cm/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) 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 ]; }; } From d48423d936e4fdf54ec7a202bf5cffb37f6e9151 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 08:38:02 +0200 Subject: [PATCH 118/239] python3Packages.pyezviz: 0.1.8.9 -> 0.1.9.1 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 40fc8794bc28f53f85a3774713f4ea0d5e23ea7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 09:56:44 +0200 Subject: [PATCH 119/239] python3Packages.googlemaps: 4.4.5 -> 4.5.3 --- pkgs/development/python-modules/googlemaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From c4af233882c8b0bba46f345a8a6a0696ac682e29 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 15 Aug 2021 13:37:04 -0700 Subject: [PATCH 120/239] libtins: fix gtest subproject This matches the submodule used by upstream. The way this was done will break once gtest is updated to v1.11.0 (currently in staging-next). --- pkgs/development/libraries/libtins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ''; From d51f83516578d092aba498cd42e74338af62c9a7 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 15 Aug 2021 09:08:14 +0200 Subject: [PATCH 121/239] intel2200BGFirmware: less fixed-output derivation Move some logic out of the fixed-output fetchzip and to a 'regular' derivation --- .../firmware/intel2200BGFirmware/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) 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; { From d3ec7e0c3d62661f2d499f196aae43fa56a08614 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 14 Aug 2021 09:59:29 +0200 Subject: [PATCH 122/239] haskellPackages.readline: fix Setup.hs to work with Cabal 3 See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- .../patches/readline-fix-for-cabal-3.patch | 8 ++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch 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..087da2075fe6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3898,7 +3898,6 @@ broken-packages: - read-bounded - read-ctags - read-io - - readline - readme-lhs - readshp - really-simple-xml-parser diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 72b6f88a9fb8..148abd06d757 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -220115,8 +220115,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 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 From 6a8e8b46152c13cd7ae8a072d36aaee943c2f795 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 11:31:44 +0200 Subject: [PATCH 123/239] home-assistant: override total-connect-client --- pkgs/servers/home-assistant/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 060a00006052..148050d83e6b 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 { }; From 699e12e4c7e804c5b2e4c14bb932f6da5dd79f0c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 16 Aug 2021 11:53:22 +0200 Subject: [PATCH 124/239] texmaker: 5.0.4 -> 5.1.0 --- pkgs/applications/editors/texmaker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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"; From 803abbf2bc053bf512fd9ab1d0ad6f2d5ff5bcda Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 16 Aug 2021 00:07:41 -0700 Subject: [PATCH 125/239] lowdown: fix musl build Whenever building a shared library, we need to compile with -fPIC. (This is sometimes implicitly added by the hardening flags, but not always, e.g. for pkgsMusl.) --- pkgs/tools/typesetting/lowdown/shared.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) + From ff1c9635cb0dae77bc88866b20980a736e254495 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Thu, 12 Aug 2021 23:27:57 +0430 Subject: [PATCH 126/239] openocd: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/openocd/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/openocd/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f71bf066f21..8ce4ba8f4f1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14180,7 +14180,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; }; From 9f62ba081e3f0d87227939c3453296fd65746842 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:06:53 +0430 Subject: [PATCH 127/239] arduino-ci, arduino-cli, arduino-core, arduino-mk, ino: move arduino/ directory to pkgs/development/embedded/ --- .../{ => embedded}/arduino/arduino-ci/default.nix | 0 .../{ => embedded}/arduino/arduino-cli/default.nix | 0 .../{ => embedded}/arduino/arduino-core/default.nix | 0 .../{ => embedded}/arduino/arduino-core/downloads.nix | 0 .../{ => embedded}/arduino/arduino-mk/default.nix | 0 .../development/{ => embedded}/arduino/ino/default.nix | 0 pkgs/top-level/all-packages.nix | 10 +++++----- 7 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/{ => embedded}/arduino/arduino-ci/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-cli/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-core/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-core/downloads.nix (100%) rename pkgs/development/{ => embedded}/arduino/arduino-mk/default.nix (100%) rename pkgs/development/{ => embedded}/arduino/ino/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ce4ba8f4f1f..63238c71e619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1146,13 +1146,13 @@ 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 { }; @@ -13931,7 +13931,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 { }; From 08d9ac46db3304a6f10b015d04839c3b1d13aa36 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:02:33 +0430 Subject: [PATCH 128/239] platformio: move the directory to pkgs/development/embedded/ --- pkgs/development/{arduino => embedded}/platformio/chrootenv.nix | 0 pkgs/development/{arduino => embedded}/platformio/core.nix | 0 pkgs/development/{arduino => embedded}/platformio/default.nix | 0 .../{arduino => embedded}/platformio/fix-searchpath.patch | 0 .../platformio/missing-udev-rules-nixos.patch | 0 .../platformio/use-local-spdx-license-list.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{arduino => embedded}/platformio/chrootenv.nix (100%) rename pkgs/development/{arduino => embedded}/platformio/core.nix (100%) rename pkgs/development/{arduino => embedded}/platformio/default.nix (100%) rename pkgs/development/{arduino => embedded}/platformio/fix-searchpath.patch (100%) rename pkgs/development/{arduino => embedded}/platformio/missing-udev-rules-nixos.patch (100%) rename pkgs/development/{arduino => embedded}/platformio/use-local-spdx-license-list.patch (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63238c71e619..4ef662fd3969 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 1b76de8268ece6622d8bf19c634b456c0a2ca79a Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:08:34 +0430 Subject: [PATCH 129/239] blackmagic: move the directory to pkgs/development/embedded/ --- .../development/{tools/misc => embedded}/blackmagic/default.nix | 0 pkgs/development/{tools/misc => embedded}/blackmagic/helper.sh | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/blackmagic/default.nix (100%) rename pkgs/development/{tools/misc => embedded}/blackmagic/helper.sh (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ef662fd3969..60dca482826b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13369,7 +13369,7 @@ 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 { }; From 0fc6582466599de0589af3b13140f356d3454ccb Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:12:44 +0430 Subject: [PATCH 130/239] betaflight: move the directory to pkgs/development/embedded/stm32/ --- .../development/{misc => embedded}/stm32/betaflight/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{misc => embedded}/stm32/betaflight/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60dca482826b..871b63347fa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From 5194c3580c22d3eb9ee9ed52cfc74db4b30edd5b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:14:46 +0430 Subject: [PATCH 131/239] inav: move the directory to pkgs/development/embedded/stm32/ --- pkgs/development/{misc => embedded}/stm32/inav/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{misc => embedded}/stm32/inav/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 871b63347fa8..803840ae0eaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From 4c16ff4e4a09ab13cccecbe081e21822b250b835 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:19:02 +0430 Subject: [PATCH 132/239] stm32flash: move the directory to pkgs/development/embedded/stm32/ --- .../{tools/misc => embedded/stm32}/stm32flash/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/stm32}/stm32flash/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 803840ae0eaf..5500a64c1362 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14473,7 +14473,7 @@ with pkgs; stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; - stm32flash = callPackage ../development/tools/misc/stm32flash { }; + stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; From 6d250116f7bd98947ff6ae428fff88434787890f Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:22:30 +0430 Subject: [PATCH 133/239] openfpgaloader: move the directory to pkgs/development/embedded/fpga/ --- .../{tools/misc => embedded/fpga}/openfpgaloader/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/openfpgaloader/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5500a64c1362..6af84fef3826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 0aafe24e76fb8ca3e279d404dce550db6bf5ebdd Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:25:16 +0430 Subject: [PATCH 134/239] icestorm: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools => embedded/fpga}/icestorm/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/icestorm/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af84fef3826..6d8cff653f40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13915,7 +13915,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 { }; From 8eec22ea678f25c3da08a7f7eef8eba28bc3a817 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:26:32 +0430 Subject: [PATCH 135/239] fujprog: move the directory to pkgs/development/embedded/fpga/ --- .../{tools/misc => embedded/fpga}/fujprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/fujprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d8cff653f40..f6001e30035e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; From bef288e84ee964ad4e58e40eb16b10d914d4d54f Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:32:11 +0430 Subject: [PATCH 136/239] stm32cubemx: move the directory to pkgs/development/embedded/stm32/ --- .../{tools/misc => embedded/stm32}/stm32cubemx/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/stm32}/stm32cubemx/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6001e30035e..35788a325301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14471,7 +14471,7 @@ with pkgs; sselp = callPackage ../tools/X11/sselp{ }; - stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; From d8041d2084aa47ba254f1c5595fa3c594878e284 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:34:54 +0430 Subject: [PATCH 137/239] xc3sprog: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/xc3sprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/xc3sprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35788a325301..4c9ed9ceabe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14650,7 +14650,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 { }; From 48d9e57d0f3a10a7f0fffff3a770140c7b494839 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:37:55 +0430 Subject: [PATCH 138/239] lattice-diamond: move the directory to pkgs/development/embedded/fpga/ --- .../{tools => embedded/fpga}/lattice-diamond/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/lattice-diamond/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c9ed9ceabe2..498d8db67211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 864adb1a08cf2303569e4c8f9aa4fc306782704b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:46:37 +0430 Subject: [PATCH 139/239] ecpdap: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools => embedded/fpga}/ecpdap/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/ecpdap/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 498d8db67211..860c3c16579c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24011,7 +24011,7 @@ with pkgs; jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { + ecpdap = callPackage ../development/embedded/fpga/ecpdap { inherit (darwin.apple_sdk.frameworks) AppKit; }; From 5e0993a300ee6fd3a19a034b23e355705e41c1d6 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:48:47 +0430 Subject: [PATCH 140/239] apio: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools/misc => embedded/fpga}/apio/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/apio/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860c3c16579c..31663f1f2b4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1154,7 +1154,7 @@ with pkgs; 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 {}; From 87c7e516bdc5601b17a2fad6c76a43d566251353 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:54:21 +0430 Subject: [PATCH 141/239] tinyprog: move the directory to pkgs/development/embedded/fpga/ --- .../{tools/misc => embedded/fpga}/tinyprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded/fpga}/tinyprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31663f1f2b4d..6e6adb97e250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From f46e3cbf67b6e2c6514df178f6bdbc5718f002e7 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:56:45 +0430 Subject: [PATCH 142/239] trellis: move the directory to pkgs/development/embedded/fpga/ --- pkgs/development/{tools => embedded/fpga}/trellis/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded/fpga}/trellis/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6adb97e250..d74b6510f4d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14573,7 +14573,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - trellis = callPackage ../development/tools/trellis { }; + trellis = callPackage ../development/embedded/fpga/trellis { }; ttyd = callPackage ../servers/ttyd { }; From 5a87ddfe6401560d8a788eaf2e913341560cf8b7 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 19:59:50 +0430 Subject: [PATCH 143/239] avrdude: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/avrdude/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/avrdude/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d74b6510f4d3..b5b0eed416e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From f60a6512a398f01841316559460132e25e6b4089 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:01:02 +0430 Subject: [PATCH 144/239] easypdkprog: move the directory to pkgs/development/embedded/ --- .../{tools/misc => embedded}/easypdkprog/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/easypdkprog/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5b0eed416e3..92a39242d65b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 7a069de4684bcbdd3f2f12596acb9e778e7b909e Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:02:19 +0430 Subject: [PATCH 145/239] teensy-loader-cli: move the directory to pkgs/development/embedded/ --- .../{tools/misc => embedded}/teensy-loader-cli/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/teensy-loader-cli/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92a39242d65b..5b30721f4143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14528,7 +14528,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 { }; From fd49ef2d0ada0ba385090fc8bb0c89c4697cbf6b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:03:23 +0430 Subject: [PATCH 146/239] bossa: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/bossa/bin2c.c | 0 .../{tools/misc => embedded}/bossa/bossa-no-applet-build.patch | 0 pkgs/development/{tools/misc => embedded}/bossa/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/bossa/bin2c.c (100%) rename pkgs/development/{tools/misc => embedded}/bossa/bossa-no-applet-build.patch (100%) rename pkgs/development/{tools/misc => embedded}/bossa/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b30721f4143..461eee64f034 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13375,7 +13375,7 @@ with pkgs; bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/tools/misc/bossa { + bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; From 61b0840054f5a375ef5bf929a61fb2ff8ae8236c Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:04:11 +0430 Subject: [PATCH 147/239] gputils: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/gputils/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/gputils/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 461eee64f034..422386212971 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 4ed61ca8bcad6e4631ece7b892bddb390b0ca82b Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:04:51 +0430 Subject: [PATCH 148/239] uisp: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/uisp/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/uisp/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 422386212971..6eaa1b778ac9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14596,7 +14596,7 @@ with pkgs; boost = boost17x; }; - uisp = callPackage ../development/tools/misc/uisp { }; + uisp = callPackage ../development/embedded/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; From 832cdd2850ed1d646f681655d8db87123f6f656a Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Sat, 14 Aug 2021 20:06:04 +0430 Subject: [PATCH 149/239] cc-tool: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools/misc => embedded}/cc-tool/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools/misc => embedded}/cc-tool/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eaa1b778ac9..fa02513a1807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; From 7bb75b3c41a0f82de80641fb033eae57c7e36622 Mon Sep 17 00:00:00 2001 From: Pooya Moradi Date: Mon, 16 Aug 2021 12:20:30 +0430 Subject: [PATCH 150/239] rshell: move the directory to pkgs/development/embedded/ --- pkgs/development/{tools => embedded}/rshell/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{tools => embedded}/rshell/default.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa02513a1807..983c8f8ae7d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18474,7 +18474,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 { }; From 21eb8c5b37c6bcc18ecd2ebaeaf4a4fabe9c0f36 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 16 Aug 2021 13:01:57 +0200 Subject: [PATCH 151/239] Revert "matrix-synapse: fix homeserver script" This reverts commit 4444860f074e4530c25217a528748786f9334308. --- pkgs/servers/matrix-synapse/default.nix | 18 ++++----------- .../matrix-synapse/homeserver-script.patch | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 pkgs/servers/matrix-synapse/homeserver-script.patch diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 2f9ceba4f562..0b0133082ef3 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -19,6 +19,11 @@ buildPythonApplication rec { sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU="; }; + patches = [ + # adds an entry point for the service + ./homeserver-script.patch + ]; + buildInputs = [ openssl ]; propagatedBuildInputs = [ @@ -65,19 +70,6 @@ buildPythonApplication rec { PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; - postFixup = '' - mkdir -p $out/bin - - # Make a little wrapper for running Synapse with its dependencies - echo "#!/bin/sh - exec python -m synapse.app.homeserver \"\$@\" - " > $out/bin/homeserver - chmod +x $out/bin/homeserver - wrapProgram $out/bin/homeserver \ - --set PATH ${python3}/bin \ - --set PYTHONPATH $PYTHONPATH - ''; - passthru.tests = { inherit (nixosTests) matrix-synapse; }; passthru.plugins = plugins; passthru.tools = tools; diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/pkgs/servers/matrix-synapse/homeserver-script.patch new file mode 100644 index 000000000000..554a2c5f66c1 --- /dev/null +++ b/pkgs/servers/matrix-synapse/homeserver-script.patch @@ -0,0 +1,23 @@ +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 + From 611182d3cf8db1fd01c808a84c11b5624488d2d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 16 Aug 2021 12:17:12 +0200 Subject: [PATCH 152/239] python3Packages.pymyq: 3.1.0 -> 3.1.2 --- pkgs/development/python-modules/pymyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From c4d6dc8c9b1cc102b4f3ea796a2df061a53c9405 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 16 Aug 2021 12:39:02 +0200 Subject: [PATCH 153/239] home-assistant: 2021.8.6 -> 2021.8.7 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 148050d83e6b..a3a2b07c149d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,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"; @@ -151,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 From d72d1fe1e53b1a6879093091e7039ba980cbc8da Mon Sep 17 00:00:00 2001 From: Las Safin Date: Mon, 16 Aug 2021 11:33:38 +0000 Subject: [PATCH 154/239] v4l2loopback: Add bin output with utils --- pkgs/os-specific/linux/v4l2loopback/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 53f37e805fa7..539c7b7c1e61 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -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" From 5a01d3ac1f1ea31b9b2635eb2ae1d9f6cd860230 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 16 Aug 2021 13:48:00 +0200 Subject: [PATCH 155/239] matrix-synapse: fix startup --- ...tup-add-homeserver-as-console-script.patch | 33 +++++++++++++++++++ pkgs/servers/matrix-synapse/default.nix | 3 +- .../matrix-synapse/homeserver-script.patch | 23 ------------- 3 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 pkgs/servers/matrix-synapse/0001-setup-add-homeserver-as-console-script.patch delete mode 100644 pkgs/servers/matrix-synapse/homeserver-script.patch 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 0b0133082ef3..4cac9bdcb3fe 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -20,8 +20,7 @@ buildPythonApplication rec { }; 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 - From 2b98af6e38f0b3edb2ddb0736866eb1c4e1ba172 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 16 Aug 2021 13:52:54 +0200 Subject: [PATCH 156/239] python3Packages.furo: init at 2021.8.11b42 --- .../python-modules/furo/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/furo/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c39b78bdf1c..0a7483599a78 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; }; From 74de2167c4044950908aa147c182544eb7148006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 16 Aug 2021 12:53:30 +0200 Subject: [PATCH 157/239] python39Packages.google-cloud-resource-manager: Add missing depedencies, fix imports --- .../google-cloud-resource-manager/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 74c692d89060..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,6 +4,8 @@ , pytestCheckHook , google-cloud-core , google-api-core +, grpc-google-iam-v1 +, proto-plus , mock }: @@ -16,7 +18,7 @@ buildPythonPackage rec { 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"; From 9c35ef5a23d54591dcf8d6634aba51fa6ddc4ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 16 Aug 2021 12:53:51 +0200 Subject: [PATCH 158/239] python39Packages.google-cloud-storage: Disable tests which require network --- .../python-modules/google-cloud-storage/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index c718849ba140..31d426907f98 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -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 From fb4e03fe68b9bffcbb73d5bcb4e57beee4d23d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 16 Aug 2021 12:54:23 +0200 Subject: [PATCH 159/239] python39Packages.grpc-google-iam-v1: deactivate tests, normalise name, adopt --- .../google-cloud-appengine-logging/default.nix | 4 ++-- .../python-modules/google-cloud-asset/default.nix | 4 ++-- .../google-cloud-bigquery-logging/default.nix | 4 ++-- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- .../google-cloud-container/default.nix | 4 ++-- .../google-cloud-iam-logging/default.nix | 4 ++-- .../python-modules/google-cloud-iot/default.nix | 4 ++-- .../python-modules/google-cloud-kms/default.nix | 4 ++-- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- .../google-cloud-secret-manager/default.nix | 4 ++-- .../google-cloud-securitycenter/default.nix | 4 ++-- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- .../python-modules/google-cloud-tasks/default.nix | 4 ++-- .../default.nix | 12 +++++++----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 16 files changed, 35 insertions(+), 32 deletions(-) rename pkgs/development/python-modules/{grpc_google_iam_v1 => grpc-google-iam-v1}/default.nix (71%) 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 b195bc2ad6e9..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 @@ -21,7 +21,7 @@ buildPythonPackage rec { 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 425d6c007bb3..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 @@ -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-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index de4e987a27ad..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 @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-api-core - grpc_google_iam_v1 + grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 1fa5388a2e42..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 @@ -22,7 +22,7 @@ buildPythonPackage rec { 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 7207d1c1e980..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 @@ -19,7 +19,7 @@ buildPythonPackage rec { 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-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 1dbf6f224c5b..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 @@ -21,7 +21,7 @@ buildPythonPackage rec { 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 bdda73c562a2..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 @@ -19,7 +19,7 @@ buildPythonPackage rec { 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 ed62318fb54f..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 @@ -19,7 +19,7 @@ buildPythonPackage rec { 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-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 17908b907177..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 @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - grpc_google_iam_v1 + grpc-google-iam-v1 google-api-core libcst proto-plus 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 2b4822d9de33..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 @@ -21,7 +21,7 @@ buildPythonPackage rec { 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 56dcb29ef45d..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 @@ -19,7 +19,7 @@ buildPythonPackage rec { 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 d8f37d65b37f..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 @@ -23,7 +23,7 @@ buildPythonPackage rec { 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-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 06970ed2b9dc..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 @@ -19,7 +19,7 @@ buildPythonPackage rec { 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/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/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..ff7d3a148ee2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3164,7 +3164,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 { }; From 409dd0bf58a376727fa8d2af0a99f4c00133439e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 14 Aug 2021 17:27:04 -0400 Subject: [PATCH 160/239] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-comment.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cpp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-fish.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-haskell.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-html.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-javascript.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-latex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-lua.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-nix.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-scala.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-typescript.json | 8 ++++---- 12 files changed, 48 insertions(+), 48 deletions(-) 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 From 34be58010795f34b551c2ccaa3db3c2743738677 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 15 Aug 2021 11:29:18 +0200 Subject: [PATCH 161/239] gprolog: replace name with pname&version --- pkgs/development/compilers/gprolog/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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; From 47aa19484c101b4146c5a6282807de2290f8f523 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Mon, 16 Aug 2021 12:12:41 +0000 Subject: [PATCH 162/239] v4l2loopback: unstable-2020-04-22 -> unstable-2021-07-13 --- pkgs/os-specific/linux/v4l2loopback/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 539c7b7c1e61..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" ]; From c560737206632c0ce00c4eb3c0b319c8c2b542aa Mon Sep 17 00:00:00 2001 From: Jonas Weissensel Date: Mon, 16 Aug 2021 13:59:21 +0200 Subject: [PATCH 163/239] standardnotes: 3.5.18 -> 3.8.18 Upgrade version and fix platform string. --- pkgs/applications/editors/standardnotes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 { From c010d0d2d98b448e528d71bb8cd7a311dbc59091 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 14:21:45 +0200 Subject: [PATCH 164/239] python3Packages.zeroconf: 0.35.0 -> 0.35.1 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5f9da6a4da01..84567049c10a 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.35.1"; 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-zEi5wVxPeIdP+1mn9DOSIVtNNFgjnEUdEnWU+FSoM7A="; }; propagatedBuildInputs = [ From 8e2afd691f70225b508b118f06cd968e138db67a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 16 Aug 2021 13:02:11 +0200 Subject: [PATCH 165/239] Revert "signal-desktop: Add a Python wrapper to re-encrypt DBs" This reverts commit 45bd7b39a444c904986324b5f7c46ba867612575. It's been three months now since the introduction of this hack so we can finally drop it. All active users should have a re-encrypted DB by now since Signal-Desktop builds expire after three months. --- .../signal-desktop/db-reencryption-wrapper.py | 92 ------------------- .../signal-desktop/default.nix | 15 +-- 2 files changed, 1 insertion(+), 106 deletions(-) delete mode 100755 pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py 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; From c5009da1b2740b29e58cc7e9414ca3ba765e91c0 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 16 Aug 2021 14:47:04 +0200 Subject: [PATCH 166/239] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 2 ++ .../transitive-broken.yaml | 16 ++++------------ .../haskell-modules/hackage-packages.nix | 19 +++++++------------ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 087da2075fe6..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 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 148abd06d757..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 @@ -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 @@ -60568,6 +60565,8 @@ self: { ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-ekg" = callPackage @@ -133873,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 @@ -138469,7 +138467,6 @@ self: { ]; description = "Nock 5K interpreter"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "hsnoise" = callPackage @@ -143160,7 +143157,6 @@ self: { ]; description = "A simple command line calculator"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "hutton" = callPackage @@ -153004,6 +153000,8 @@ self: { ]; description = "Yet another streaming library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jinquantities" = callPackage @@ -167305,6 +167303,7 @@ self: { ]; description = "Support for developing against the LNURL protocol"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lnurl-authenticator" = callPackage @@ -167327,6 +167326,7 @@ self: { 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 @@ -176520,7 +176520,6 @@ self: { ]; description = "Miniature FORTH-like interpreter"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "minilens" = callPackage @@ -177372,7 +177371,6 @@ self: { ]; description = "Generate cabal files for a Haskell project"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "ml-w" = callPackage @@ -180471,6 +180469,7 @@ self: { ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {GLEW = null;}; "monomorphic" = callPackage @@ -216358,7 +216357,6 @@ self: { ]; description = "A package for prompting values from the command-line"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "queue" = callPackage @@ -220126,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 @@ -255243,7 +255240,6 @@ self: { ]; description = "Clojure without alphanumerics"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "sweet-egison" = callPackage @@ -271015,7 +271011,6 @@ self: { ]; description = "A Haskell-based CLI Twitter client"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "twitter-conduit" = callPackage From 8d6faa6ac1f2af04985cf499cdb64cca3ff00ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 16 Aug 2021 15:03:12 +0200 Subject: [PATCH 167/239] python39Packages.google-cloud-datacatalog: init at 3.4.0 --- .../google-cloud-datacatalog/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-datacatalog/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff7d3a148ee2..9e80148e08b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2997,6 +2997,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 { }; From d25bcbb2684dbd76dfa38a67efb8982765b118bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 16 Aug 2021 15:02:57 +0200 Subject: [PATCH 168/239] python39Packages.google-cloud-bigquery: Fix tests --- .../python-modules/google-cloud-bigquery/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 76b43b9e993f..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 @@ -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 = [ From eec7d8209cfb7f9c9bbb2ee01ae72c3cb6809459 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 09:11:22 -0400 Subject: [PATCH 169/239] vimPlugins.lir-nvim: init at 2021-08-15 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index caa79fa787b0..e136aba69be8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2698,6 +2698,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"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 4122e45250fd..aa6b762fd850 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"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b55e9680a2c7..0891f0607c12 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -669,6 +669,7 @@ t9md/vim-smalls TaDaa/vimade takac/vim-hardtime tamago324/compe-zsh +tamago324/lir.nvim tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim From 8f37a4a310069a92428ffdd99a21b5b286719e05 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 16 Aug 2021 15:12:46 +0200 Subject: [PATCH 170/239] pikchr: unstable-2021-04-07 -> unstable-2021-07-22 --- pkgs/tools/graphics/pikchr/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 From ce651d3aab072231e04dfdb494ab19ca0bd5f9a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Aug 2021 06:33:07 -0700 Subject: [PATCH 171/239] rss2email: 3.13 -> 3.13.1 (#134087) --- .../applications/networking/feedreaders/rss2email/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" ]; From f448b23f1bea906daf31caafce2f5a3ea42a82f2 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 16 Aug 2021 15:37:50 +0200 Subject: [PATCH 172/239] opentelemetry-collector: remove unused input --- pkgs/tools/misc/opentelemetry-collector/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 1d6cce633408..992984c9cec0 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, stdenv , lib }: From cd434db08e4f3c72eada7fb2085ced9aaa68ebd3 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Fri, 6 Aug 2021 16:38:03 +0200 Subject: [PATCH 173/239] xmrig-mo: init at 6.14.1-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 21 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/misc/xmrig/moneroocean.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 204f3c8b6ef4..cfe4cc76ed4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25911,6 +25911,8 @@ in 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 { }; From 9c442240bf1a5e603bfdc1e080cca3d4b0bf0614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Aug 2021 15:47:42 +0200 Subject: [PATCH 174/239] nodePackages: update package set --- .../node-packages/node-packages.nix | 3091 ++++++++--------- 1 file changed, 1522 insertions(+), 1569 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4c0ec21eba84..3d3a88e2dcda 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1202.0" = { + "@angular-devkit/architect-0.1202.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.0"; + version = "0.1202.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.0.tgz"; - sha512 = "99O8iLO9LEVTPYN6kj6XINHxjw13ofTS48hm3D0i44QMEyq3SRH1ctH6HcUAtbgPF3VjOUFr5vRYpQN1OdOCXw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.1.tgz"; + sha512 = "sH2jzzfvXxVvlT7ZE175pHdZ4KW50hFfvF10U8Nry83dpfE54eeCntGfkT40geGwJXG+ibP/T9SG7PsbTssvKQ=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,13 +76,13 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.2.0" = { + "@angular-devkit/core-12.2.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.0.tgz"; - sha512 = "9H2NfE4eazpMPwbAx4ZbtTNijo6419DZsmQzlzwQWzTInO3+CAjQuyW53W5Nt/IoauNVOgOEsC8/YbYjNmN0Aw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.1.tgz"; + sha512 = "To/2a5+PRroaCNEvqm5GluXhUwkThIBgF7I0HsmYkN32OauuLYPvwZYAKuPHMDNEFx9JKkG5RZonslXXycv1kw=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -103,13 +103,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.2.0" = { + "@angular-devkit/schematics-12.2.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.0.tgz"; - sha512 = "C+eutMKtOLROk/2zs1NkXeLZJpFtvZm7ctWmcns0Yh83Di2sCgGiSqdqNZFyDplxkt5W5lF2cdBSGyP8ZH+/ug=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.1.tgz"; + sha512 = "lzW3HuoF0rCbYVqqnZp/68WWD09mjLd8N0WAhiod0vlFwMTq16L5D9zKCbC0unjjsIAJsIiT2ERHQICrOP1OKQ=="; }; }; "@angular-devkit/schematics-cli-12.1.4" = { @@ -625,13 +625,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.8" = { + "@babel/helpers-7.15.3" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; - sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz"; + sha512 = "HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g=="; }; }; "@babel/highlight-7.14.5" = { @@ -652,13 +652,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.15.2" = { + "@babel/parser-7.15.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.2"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz"; - sha512 = "bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz"; + sha512 = "O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1048,13 +1048,13 @@ let sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.14.5" = { + "@babel/plugin-transform-block-scoping-7.15.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.14.5"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz"; - sha512 = "LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; "@babel/plugin-transform-classes-7.14.9" = { @@ -1462,13 +1462,13 @@ let sha512 = "lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow=="; }; }; - "@babel/register-7.14.5" = { + "@babel/register-7.15.3" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.14.5"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.14.5.tgz"; - sha512 = "TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.15.3.tgz"; + sha512 = "mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw=="; }; }; "@babel/runtime-7.13.9" = { @@ -1480,13 +1480,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.8" = { + "@babel/runtime-7.15.3" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.8"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; - sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; + sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; }; }; "@babel/runtime-7.9.0" = { @@ -1498,22 +1498,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.9" = { + "@babel/runtime-corejs3-7.15.3" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.9"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz"; - sha512 = "64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz"; + sha512 = "30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A=="; }; }; - "@babel/standalone-7.15.2" = { + "@babel/standalone-7.15.3" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.15.2"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.2.tgz"; - sha512 = "q/DsJPZ2v0PjH4UL0DaEOCT/pERnXPsfERLbILXuzS8BWF6NuBAxJwf2/h/XiyJZZ4X/7BVrmoW6H7u3H6nDYQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.3.tgz"; + sha512 = "Bst2YWEyQ2ROyO0+jxPVnnkSmUh44/x54+LSbe5M4N5LGfOkxpajEUKVE4ndXtIVrLlHCyuiqCPwv3eC1ItnCg=="; }; }; "@babel/template-7.14.5" = { @@ -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.1" = { + "@google-cloud/pubsub-2.16.3" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.1"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; - sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.3.tgz"; + sha512 = "KkH0IH1PUzgWBquUhWfSG//R/8K3agYRyrqqeNtLjbr2lnehrOVllPtdnroO4q2lxoul3WrK+esPvtVywkb4Ag=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2605,22 +2605,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-7.0.0" = { + "@graphql-tools/merge-8.0.1" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "7.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz"; - sha512 = "u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.1.tgz"; + sha512 = "YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ=="; }; }; - "@graphql-tools/mock-8.1.8" = { + "@graphql-tools/mock-8.2.1" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.1.8"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.8.tgz"; - sha512 = "ZLt4THOdDrwzMP5bKYaWJwJFYmacQojNWHt5Oo0c50N0jWe+PD/AbPbrn8Jb7mdVMhnxDgdMGwhsEFBhHSKJVA=="; + 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.0.3" = { + "@graphql-tools/schema-8.1.1" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.0.3"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.3.tgz"; - sha512 = "ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA=="; + 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,6 +2677,15 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; + "@graphql-tools/utils-8.1.1" = { + name = "_at_graphql-tools_slash_utils"; + packageName = "@graphql-tools/utils"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.1.tgz"; + sha512 = "QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw=="; + }; + }; "@graphql-tools/wrap-7.0.8" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; @@ -2713,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"; @@ -3136,67 +3136,58 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.31" = { + "@joplin/fork-htmlparser2-4.1.33" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.31"; + version = "4.1.33"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.31.tgz"; - sha512 = "5v7vYawEQP+0wHjT3sXi5LgRiWWImbnNdsTf6mdKg+IeX9KCjYnc7aZRGdC+yQlEQbcIRpu8bKUQnh/WoaMG7g=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.33.tgz"; + sha512 = "Q5GR6mVKS/1JgNTHtS0hc08YexfVZIq9RAj9j33Zm9SXEDstXn0WP4UpULCWLYOen3ffJ2z4uv9a2vLKcvbbIg=="; }; }; - "@joplin/fork-sax-1.2.35" = { + "@joplin/fork-sax-1.2.37" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.35"; + version = "1.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.35.tgz"; - sha512 = "+0K4PbooQweodhTIaehh9QdC9g6SH7IpFzeNsv3Eh3T7LT985XJ1mZfXEjRI5pfWrRj9ibvxHcgvMzEQuXPM3g=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.37.tgz"; + sha512 = "3S71WcFLsZQ4tlZ7LNZRBoEE0LJJL8gxhqwAKZXKYTF5syShZDNWwSpntB4AoFWry3L0I+HnjXm2psQfQzo15Q=="; }; }; - "@joplin/lib-2.1.1" = { + "@joplin/lib-2.3.1" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "2.1.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.1.1.tgz"; - sha512 = "mePMxOEC7+T7gTRuIO3ZWxkyDhAhuoNNGi3wsf4g633TcYD0SEX9peokCdjAnQC5l4BjrqxmgY1qTmk2sx+9TA=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.3.1.tgz"; + sha512 = "/OIyf4AdF/JLFf+ZTYsusrjl5XCDV20wwi0JnvxnySYgG9Y4GgNusDPI0/77+rj+KQA/E91FzGeWoSDc5XOUsA=="; }; }; - "@joplin/renderer-1.8.2" = { + "@joplin/renderer-2.3.1" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "1.8.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-1.8.2.tgz"; - sha512 = "Khl2DoM1aFEy15RX9JaMaYinjoNEYQHOgQqzMHq4wuWr+QuAQaX8/SofTe1FU2rS4SJrkObPA+XPavhVSAxpOQ=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.3.1.tgz"; + sha512 = "wOxuScEao2f3kIs+A0qroWe6CiWs1LeZqwBz/w869Qi8MW8wvy2aeyirpnb7yEYh9aCevfiQcUMUvYZ9ekMskg=="; }; }; - "@joplin/renderer-2.1.1" = { - name = "_at_joplin_slash_renderer"; - packageName = "@joplin/renderer"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.1.1.tgz"; - sha512 = "XxmquKGZxlrjUorx924ogAACc39p22pzWp06DJX/eElU2kLZ/s+RC0EXAFj503EuDj/dd2voV+Tciz0wfCPc0Q=="; - }; - }; - "@joplin/turndown-4.0.53" = { + "@joplin/turndown-4.0.55" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.53"; + version = "4.0.55"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.53.tgz"; - sha512 = "uYeROpicdZKWq2WLOuKTAsG5wEZu8cy/kjWRBIkuyql575NRzyONh9e4UtT6tiWmPWtuVNHmaBJJyIzAwstfLg=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.55.tgz"; + sha512 = "9IgtCAQXzCtkXNE+/4q6dWnbt90kvZIefTLFXLxE+w/gLbBDxSmTCfhCCFPzUA1ORp3LkAJZIiE710fRM0O3gg=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.35" = { + "@joplin/turndown-plugin-gfm-1.0.37" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.35"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.35.tgz"; - sha512 = "jMc8Cjq3K2szQGsi39yQpxMuR3JCCkIFWjQxKRlOW7JvbaTeMPuGqpEafuNqtn7qU6DoYF72p/glKmU8p2t3Dg=="; + 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" = { @@ -4000,13 +4000,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.197" = { + "@microsoft/load-themed-styles-1.10.202" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.197"; + version = "1.10.202"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.197.tgz"; - sha512 = "w/RyqDpXR5unGjcFpzla6CE4L/r6AMbVkrxbK8Xq4Wl1GMfmK/5YWUz0wdCBHqCb+FuhQKni+ThGPti2pzI2mg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.202.tgz"; + sha512 = "pWoN9hl1vfXnPfu2tS5VndXXKMe+UEWLJXDKNGXSNpmfszVLzG8Ns0TlZHlwtgpSaSD3f0kdVDfqAek8aflD4w=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4081,31 +4081,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.10.0" = { + "@netlify/build-18.2.8" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.10.0"; + version = "18.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.10.0.tgz"; - sha512 = "3L0ps4b5u34Sj03a7tJMwGkuO+Tg2eXOFVdToINV3StgjB9lTU7fOEm0jCJOw9E9QFAVpemW0tRadofYY/Hzjg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.8.tgz"; + sha512 = "fgLzpoTR/PgS3iRWNlxVuGc9OI7PYpiFyVQtPS+eL+1OS1pvilbqVusD7XbZ3AUSNMsKzOPqaUE+LXi5EwFKkA=="; }; }; - "@netlify/cache-utils-2.0.0" = { + "@netlify/cache-utils-2.0.1" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.0.tgz"; - sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-2.0.1.tgz"; + sha512 = "fAw8rMnl14f9TZmKV1g8+/8yVriitfNf4KcdfGPpGLpmQtpnSiynbzhpOLBHsLtViBCJ8O1vy24LK6CJx9JoqA=="; }; }; - "@netlify/config-14.4.3" = { + "@netlify/config-15.3.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "14.4.3"; + version = "15.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz"; - sha512 = "lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.1.tgz"; + sha512 = "XbPMPHMVN3IHF/KOOJYLvWw84u6F63bpMwt5V4UvObGMAxqosSHElZYl8/Nj4VeplLOwgikT/us50i+EHr7GxA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4135,130 +4135,130 @@ let sha512 = "mQI0NX0QPNVcYb2TQF5cpxO350BR9309r7vSOSvfn0DHkPWUea1kl3iiLXi1mm/dUC6pd3p5ctc0UboW0u+iVQ=="; }; }; - "@netlify/git-utils-2.0.0" = { + "@netlify/git-utils-2.0.1" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.0.tgz"; - sha512 = "O8cGi3yRtdqJ2pDkdcoj3t6F9JSB/SokRwZiCJjp2aBQyC+Jg3RsRH7G0MbYEjrjN6JY4/p6j62NTFqsIBGh2A=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.1.tgz"; + sha512 = "a9GKmoOJuVTQ4+0x+4utS9XOySIGX5KBhMUgPKXGAZAFNeDXGkJj+ITrzyHcyJ4P8d8WPfQEXIusIqAqlfp+DA=="; }; }; - "@netlify/local-functions-proxy-1.1.0" = { + "@netlify/local-functions-proxy-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy"; packageName = "@netlify/local-functions-proxy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.0.tgz"; - sha512 = "HoxJuJpBqmzflIcdFsnUSuf/KwYsgzrsF/jh+bXPO+aOB9pzZEH0P/e/qCAr2JbJVzOyxo/36Ti3sXbahSDAYQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.1.tgz"; + sha512 = "eXSsayLT6PMvjzFQpjC9nkg2Otc3lZ5GoYele9M6f8PmsvWpaXRhwjNQ0NYhQQ2UZbLMIiO2dH8dbRsT3bMkFw=="; }; }; - "@netlify/local-functions-proxy-darwin-arm64-1.1.0" = { + "@netlify/local-functions-proxy-darwin-arm64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; packageName = "@netlify/local-functions-proxy-darwin-arm64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.0.tgz"; - sha512 = "EOSEA/mt6IyXqou//vOo17vnQwwBKPu8wO+bZZQNb+NNgyjzYl/8wpZE0CvoYHPsEU2h0hk1xeqwaYBMihunKg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.1.tgz"; + sha512 = "lphJ9qqZ3glnKWEqlemU1LMqXxtJ/tKf7VzakqqyjigwLscXSZSb6fupSjQfd4tR1xqxA76ylws/2HDhc/gs+Q=="; }; }; - "@netlify/local-functions-proxy-darwin-x64-1.1.0" = { + "@netlify/local-functions-proxy-darwin-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; packageName = "@netlify/local-functions-proxy-darwin-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.0.tgz"; - sha512 = "P+khKO6YwjeEv+zppE7asbInliopo1mJSkQeGT27ebs4UVkZPpYefhtLs8Gs5dau7zFfPBF8PFgE1kCEMKw4+g=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.1.tgz"; + sha512 = "4CRB0H+dXZzoEklq5Jpmg+chizXlVwCko94d8+UHWCgy/bA3M/rU/BJ8OLZisnJaAktHoeLABKtcLOhtRHpxZQ=="; }; }; - "@netlify/local-functions-proxy-freebsd-arm64-1.1.0" = { + "@netlify/local-functions-proxy-freebsd-arm64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; packageName = "@netlify/local-functions-proxy-freebsd-arm64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.0.tgz"; - sha512 = "bqjyD4o7KVWrUPO/cr4HfUfUFUfTJFmjw0KFDFet//itJMSg+RocQGmjkJ8YTqWQZxwDJF7Dp44n/WGhpnWUUg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.1.tgz"; + sha512 = "u13lWTVMJDF0A6jX7V4N3HYGTIHLe5d1Z2wT43fSIHwXkTs6UXi72cGSraisajG+5JFIwHfPr7asw5vxFC0P9w=="; }; }; - "@netlify/local-functions-proxy-freebsd-x64-1.1.0" = { + "@netlify/local-functions-proxy-freebsd-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; packageName = "@netlify/local-functions-proxy-freebsd-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.0.tgz"; - sha512 = "R8a0sW5bcTbX7eKiVzFw1+2F0tO8Sw/+fQL9f9Z+2F4pT5+SKml8CLvfRU5xYl1KcxdHGq5ETcSwu/wyqfMTpA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.1.tgz"; + sha512 = "g5xw4xATK5YDzvXtzJ8S1qSkWBiyF8VVRehXPMOAMzpGjCX86twYhWp8rbAk7yA1zBWmmWrWNA2Odq/MgpKJJg=="; }; }; - "@netlify/local-functions-proxy-linux-arm-1.1.0" = { + "@netlify/local-functions-proxy-linux-arm-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm"; packageName = "@netlify/local-functions-proxy-linux-arm"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.0.tgz"; - sha512 = "iGricZd2RqBiF/LjD0EPnH0qSKjfn6RDEIp90I0BKQ2XRkQu7dPFr7m3QhOuoPIHxGERNNGK2FL4OGZ9jXEXtw=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.1.tgz"; + sha512 = "YsTpL+AbHwQrfHWXmKnwUrJBjoUON363nr6jUG1ueYnpbbv6wTUA7gI5snMi/gkGpqFusBthAA7C30e6bixfiA=="; }; }; - "@netlify/local-functions-proxy-linux-arm64-1.1.0" = { + "@netlify/local-functions-proxy-linux-arm64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; packageName = "@netlify/local-functions-proxy-linux-arm64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.0.tgz"; - sha512 = "G7KGstzhNoQwiiuVjyl64fDnNJ2Z/QsjaLDnElSUEwaqJe+0drog0wUxym/RDuVmBY//XDQfxLtG2Zl5ce4tUA=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.1.tgz"; + sha512 = "dPGu1H5n8na7mBKxiXQ+FNmthDAiA57wqgpm5JMAHtcdcmRvcXwJkwWVGvwfj8ShhYJHQaSaS9oPgO+mpKkgmA=="; }; }; - "@netlify/local-functions-proxy-linux-ia32-1.1.0" = { + "@netlify/local-functions-proxy-linux-ia32-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; packageName = "@netlify/local-functions-proxy-linux-ia32"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.0.tgz"; - sha512 = "okXWyslbX/mMm3CncfUy+CxnBW0vFoDxFaK2+tIeLz5nVizVVyPaoInTe0bs+sSrAvc3jbtt8AfV9ISmhtPx0A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.1.tgz"; + sha512 = "Ra0FlXDrmPRaq+rYH3/ttkXSrwk1D5Zx/Na7UPfJZxMY7Qo5iY4bgi/FuzjzWzlp0uuKZOhYOYzYzsIIyrSvmw=="; }; }; - "@netlify/local-functions-proxy-linux-ppc64-1.1.0" = { + "@netlify/local-functions-proxy-linux-ppc64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; packageName = "@netlify/local-functions-proxy-linux-ppc64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.0.tgz"; - sha512 = "E3sPIN9y2QMU0bvPdNF3dmMi8pMUkGd9WYJHthpY9+fcP7j7L2d5h0uuSfG9TPEZS6/SW0c1XhK8wCDGGZIRaQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.1.tgz"; + sha512 = "oXf1satwqwUUxz7LHS1BxbRqc4FFEKIDFTls04eXiLReFR3sqv9H/QuYNTCCDMuRcCOd92qKyDfATdnxT4HR8w=="; }; }; - "@netlify/local-functions-proxy-linux-x64-1.1.0" = { + "@netlify/local-functions-proxy-linux-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-linux-x64"; packageName = "@netlify/local-functions-proxy-linux-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.0.tgz"; - sha512 = "NFuOmMm5/tCOpQpuG32cFGp4n15++rsy26rWG1u7IVezOTr9SMKOmnsFxQVJGgOT7r3zBBjBJwYJN0CCNj9J3A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.1.tgz"; + sha512 = "bS3u4JuDg/eC0y4Na3i/29JBOxrdUvsK5JSjHfzUeZEbOcuXYf4KavTpHS5uikdvTgyczoSrvbmQJ5m0FLXfLA=="; }; }; - "@netlify/local-functions-proxy-openbsd-x64-1.1.0" = { + "@netlify/local-functions-proxy-openbsd-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; packageName = "@netlify/local-functions-proxy-openbsd-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.0.tgz"; - sha512 = "9G1lrpSAxT+Bd83IYYxlkMU1xNCZeLstL7gZvXymygRpLoE2oFHfSERaIOvOdbbDQ3ZkEWuX12OJ6d7TS7ievg=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.1.tgz"; + sha512 = "1xLef/kLRNkBTXJ+ZGoRFcwsFxd/B2H3oeJZyXaZ3CN5umd9Mv9wZuAD74NuMt/535yRva8jtAJqvEgl9xMSdA=="; }; }; - "@netlify/local-functions-proxy-win32-ia32-1.1.0" = { + "@netlify/local-functions-proxy-win32-ia32-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; packageName = "@netlify/local-functions-proxy-win32-ia32"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.0.tgz"; - sha512 = "F6ET6+XyAcGVIFjX66nAmj6CkgKICPtA9ZpPDLU2b3qYzvdJxW1hgp/UIRyRSRN1IqkIPJtGQZAteHhzBqnFRQ=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.1.tgz"; + sha512 = "4IOMDBxp2f8VbIkhZ85zGNDrZR4ey8d68fCMSOIwitjsnKav35YrCf8UmAh3UR6CNIRJdJL4MW1GYePJ7iJ8uA=="; }; }; - "@netlify/local-functions-proxy-win32-x64-1.1.0" = { + "@netlify/local-functions-proxy-win32-x64-1.1.1" = { name = "_at_netlify_slash_local-functions-proxy-win32-x64"; packageName = "@netlify/local-functions-proxy-win32-x64"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.0.tgz"; - sha512 = "8a5rRjDNovZYBEaAPfN1VSwGNG/ExZanrjo7HnuTgphO6i64StqrKNtNW9/h75IgH+WP+8ZmC6Y0lI0BKq/U5A=="; + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.1.tgz"; + sha512 = "VCBXBJWBujVxyo5f+3r8ovLc9I7wJqpmgDn3ixs1fvdrER5Ac+SzYwYH4mUug9HI08mzTSAKZErzKeuadSez3w=="; }; }; "@netlify/open-api-2.5.0" = { @@ -4297,22 +4297,13 @@ let sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; - "@netlify/run-utils-2.0.0" = { + "@netlify/run-utils-2.0.1" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.0.tgz"; - sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA=="; - }; - }; - "@netlify/zip-it-and-ship-it-4.16.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.16.0.tgz"; - sha512 = "DkQemRkLTpAMvwwENRCQ9h5qJDaLrjEa+PpfEh0I64om4hTXVHcTd5+YMHW0wPr4OWABA7JAWlsFOVsZADFxfQ=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-2.0.1.tgz"; + sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; "@netlify/zip-it-and-ship-it-4.17.0" = { @@ -4414,13 +4405,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.8.0" = { + "@npmcli/arborist-2.8.1" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.0.tgz"; - sha512 = "R9rTyak1rGdmVTyiU14dgBb+qMllY3B6I8hp7FB4xXsU9dJDrYZJR8I+191CMo5Y1941jTDCtNcXXW9TldPEFQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.1.tgz"; + sha512 = "kbBWllN4CcdeN032Rw6b+TIsyoxWcv4YNN5gzkMCe8cCu0llwlq5P7uAD2oyL24QdmGlrlg/Yp0L1JF+HD8g9Q=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4450,13 +4441,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-1.0.3" = { + "@npmcli/map-workspaces-1.0.4" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz"; - sha512 = "SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz"; + sha512 = "wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q=="; }; }; "@npmcli/metavuln-calculator-1.1.1" = { @@ -4684,22 +4675,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.5.0" = { + "@octokit/openapi-types-9.7.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.5.0.tgz"; - sha512 = "AEq5uAZJCnrOuNUg91yDjkE3mXyMq2lSiJpOpDyzy1e2mT1CSpsu8Yf7DuabD7TmQi0UEC8o0YrDjeXgNoI54Q=="; - }; - }; - "@octokit/openapi-types-9.6.0" = { - name = "_at_octokit_slash_openapi-types"; - packageName = "@octokit/openapi-types"; - version = "9.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.6.0.tgz"; - sha512 = "L+8x7DpcNtHkMbTxxCxg3cozvHUNP46rOIzFwoMs0piWwQzAGNXqlIQO2GLvnKTWLUh99DkY+UyHVrP4jXlowg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.7.0.tgz"; + sha512 = "TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4729,22 +4711,22 @@ 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.0" = { + "@octokit/request-5.6.1" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.0.tgz"; - sha512 = "4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.1.tgz"; + sha512 = "Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ=="; }; }; "@octokit/request-error-2.1.0" = { @@ -4756,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" = { @@ -4819,13 +4801,13 @@ let sha512 = "DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww=="; }; }; - "@opentelemetry/semantic-conventions-0.22.0" = { + "@opentelemetry/semantic-conventions-0.24.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.22.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.22.0.tgz"; - sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz"; + sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; }; }; "@ot-builder/bin-composite-types-1.1.0" = { @@ -5179,22 +5161,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@percy/config-1.0.0-beta.63" = { + "@percy/config-1.0.0-beta.65" = { name = "_at_percy_slash_config"; packageName = "@percy/config"; - version = "1.0.0-beta.63"; + version = "1.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.63.tgz"; - sha512 = "mc2DQwk0uMHV+C7vJOcLm5hrxVqAKLgJvgsN+49Y/fbl6fUTNwY2s1usTi3kfCThdGpnIkqRooVxisnOIxLEUg=="; + url = "https://registry.npmjs.org/@percy/config/-/config-1.0.0-beta.65.tgz"; + sha512 = "q6mkrBq+nmDtIDj793lNIodEYmc5wVE7ZwsQ2kNRQIAq4aiIIrD8L5CfhEOSYQ5OzhFq+qUjcZK5GptmheF0sw=="; }; }; - "@percy/logger-1.0.0-beta.63" = { + "@percy/logger-1.0.0-beta.65" = { name = "_at_percy_slash_logger"; packageName = "@percy/logger"; - version = "1.0.0-beta.63"; + version = "1.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.63.tgz"; - sha512 = "iumIt1JjrZQiD9fPShbqaUtyqgRBA1crJzwhh6MPZz4s0XJLxcEzhawKzqhtOoiB8Wr5AxVygswLOkTfPcVuFg=="; + url = "https://registry.npmjs.org/@percy/logger/-/logger-1.0.0-beta.65.tgz"; + sha512 = "BJV0pjNlvcj4Y3nuMUGdb5RhjMduK40fRJJ9Lh/2qNk3pmnkGb9rH+GY+/0WY7quupNKxQjjyXcIP7I46/azNg=="; }; }; "@percy/migrate-0.10.0" = { @@ -5512,13 +5494,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.0" = { + "@schematics/angular-12.2.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.0.tgz"; - sha512 = "2NolT/PNKgjINIHvz6o4sYFj4D4ai7Usf+HspQCi9W30qtLV4Z6hRXoEhmDxrGSlF67vJdwUwDM3sP+6Tg8XEw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.1.tgz"; + sha512 = "v6+LWx688PBmp+XWLtwu+UL1AAZsd0RsBrLmruSul70vFQ0xBB3MIuYlF5NHUukaBP/GMn426UkiTUgYUUM8ww=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5548,13 +5530,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.14.2" = { + "@serverless/components-3.15.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.14.2"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.2.tgz"; - sha512 = "mizSDUxNKT+V1hx5edZFFbMBvtWY8FkponU3seWpmkkbv1FjNPpa2wURec89T5m4WadYJDQMCpKKCwYD4DOSow=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.15.0.tgz"; + sha512 = "oi5a1QjyAoH4CiSCNB+kIyvXMcs3tfLMGXM+pk7Ns1ra5ZWoD3PImRQKRUu/2BTSYqB6iUM3+HmMQGT1yORgBg=="; }; }; "@serverless/core-1.1.2" = { @@ -7330,15 +7312,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"; @@ -7348,22 +7321,22 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.13" = { + "@types/node-16.6.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.13"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz"; - sha512 = "bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.6.0.tgz"; + sha512 = "OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ=="; }; }; - "@types/node-16.4.3" = { + "@types/node-16.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.3"; + version = "16.6.1"; 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.1.tgz"; + sha512 = "Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw=="; }; }; "@types/node-6.14.13" = { @@ -7510,13 +7483,13 @@ let sha512 = "qw1q31xPnaeExbOA1daA3nfeKW2uZQN4Xg8QqZDM3vsXPHK/lyDpjWXJQIcrByRDcBzZJ3ccchSMMTDtCWgFpA=="; }; }; - "@types/react-16.14.12" = { + "@types/react-16.14.13" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.12"; + version = "16.14.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.12.tgz"; - sha512 = "7nOJgNsRbARhZhvwPm7cnzahtzEi5VJ9OvcQk8ExEEb1t+zaFklwLVkJz7G1kfxX4X/mDa/icTmzE0vTmqsqBg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.13.tgz"; + sha512 = "KznsRYfqPmbcA5pMxc4mYQ7UgsJa2tAgKE2YwEmY5xKaTVZXLAY/ImBohyQHnEoIjxIJR+Um4FmaEYDr3q3zlg=="; }; }; "@types/react-dom-16.9.14" = { @@ -7780,13 +7753,13 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; - "@types/url-parse-1.4.3" = { + "@types/url-parse-1.4.4" = { name = "_at_types_slash_url-parse"; packageName = "@types/url-parse"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.3.tgz"; - sha512 = "4kHAkbV/OfW2kb5BLVUuUMoumB3CP8rHqlw48aHvFy5tf9ER0AfOonBlX29l/DD68G70DmyhRlSYfQPSYpC5Vw=="; + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.4.tgz"; + sha512 = "KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q=="; }; }; "@types/uuid-8.3.1" = { @@ -7879,15 +7852,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"; @@ -8248,31 +8212,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.1" = { + "@vue/compiler-core-3.2.2" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.1.tgz"; - sha512 = "UEJf2ZGww5wGVdrWIXIZo04KdJFGPmI2bHRUsBZ3AdyCAqJ5ykRXKOBn1OR1hvA2YzimudOEyHM+DpbBv91Kww=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.2.tgz"; + sha512 = "QhCI0ZU5nAR0LMcLgzW3v75374tIrHGp8XG5CzJS7Nsy+iuignbE4MZ2XJfh5TGIrtpuzfWA4eTIfukZf/cRdg=="; }; }; - "@vue/compiler-dom-3.2.1" = { + "@vue/compiler-dom-3.2.2" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.1.tgz"; - sha512 = "tXg8tkPb3j54zNfWqoao9T1JI41yWPz8TROzmif/QNNA46eq8/SRuRsBd36i47GWaz7mh+yg3vOJ87/YBjcMyQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz"; + sha512 = "ggcc+NV/ENIE0Uc3TxVE/sKrhYVpLepMAAmEiQ047332mbKOvUkowz4TTFZ+YkgOIuBOPP0XpCxmCMg7p874mA=="; }; }; - "@vue/shared-3.2.1" = { + "@vue/shared-3.2.2" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.1.tgz"; - sha512 = "INN92dVBNgd0TW9BqfQQKx/HWGCHhUUbAV5EZ5FgSCiEdwuZsJbGt1mdnaD9IxGhpiyOjP2ClxGG8SFp7ELcWg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.2.tgz"; + sha512 = "dvYb318tk9uOzHtSaT3WII/HscQSIRzoCZ5GyxEb3JlkEXASpAUAQwKnvSe2CudnF8XHFRTB7VITWSnWNLZUtA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8788,13 +8752,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" = { @@ -8869,13 +8833,13 @@ let sha512 = "FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw=="; }; }; - "@yarnpkg/fslib-2.5.0" = { + "@yarnpkg/fslib-2.5.1" = { name = "_at_yarnpkg_slash_fslib"; packageName = "@yarnpkg/fslib"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.0.tgz"; - sha512 = "xkKmuW3HwQeWOPqOhBCbDjTGbgimP/VWN2bPpx4FnfgbVj1xjULyOtZR5h9p49jA7IIZsccG91+Ad9kLZ2A4DA=="; + url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.1.tgz"; + sha512 = "Y360rwoaUBCF8i9nRepyuFQFNF5OybHafO4PQ5Pf68sT3H6ulmT2t/KjdtMey8zyJkDu5qrC3IgHk0c7zWRIrg=="; }; }; "@yarnpkg/json-proxy-2.1.1" = { @@ -9328,22 +9292,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" = { @@ -9580,6 +9544,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"; @@ -11686,22 +11659,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.964.0" = { + "aws-sdk-2.968.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.964.0"; + version = "2.968.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.964.0.tgz"; - sha512 = "yDRLkPUiGvIXpccFd1PqOQZ1MJvYkh0RVBNWfquDoPonQuJ9QOCZoPrpe3VlB8IGMOODbVRSH1NRqPa12gNjBA=="; - }; - }; - "aws-sdk-2.965.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.965.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.965.0.tgz"; - sha512 = "jifeFsA6IEKXM65WI5gvBNSCXKw4n64Wf9Q7/8E7wZ5vzRbBGoHzGpyhK6ZBBRvE2YvNp/ykTWChO7RydkA+AQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.968.0.tgz"; + sha512 = "6kXJ/4asP+zI8oFJAUqEmVoaLOnAYriorigKy8ZjFe3ISl4w0PEOXBG1TtQFuLiNPR3BAvhRuOQ5yH6JfqDNNw=="; }; }; "aws-sign2-0.6.0" = { @@ -11821,15 +11785,6 @@ let sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA=="; }; }; - "babel-eslint-10.1.0" = { - name = "babel-eslint"; - packageName = "babel-eslint"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; - }; - }; "babel-helper-evaluate-path-0.5.0" = { name = "babel-helper-evaluate-path"; packageName = "babel-helper-evaluate-path"; @@ -15098,13 +15053,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001249" = { + "caniuse-lite-1.0.30001251" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001249"; + version = "1.0.30001251"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz"; - sha512 = "vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"; + sha512 = "HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A=="; }; }; "canvas-2.8.0" = { @@ -16781,13 +16736,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" = { @@ -17375,13 +17330,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" = { @@ -17834,13 +17789,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.118" = { + "constructs-3.3.124" = { name = "constructs"; packageName = "constructs"; - version = "3.3.118"; + version = "3.3.124"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.118.tgz"; - sha512 = "Fe3XE/kVbfFomPtogd3h+5X9JHyMSLO8swjKYqUexgifX4qwOjsUYMHfZpB0a3xNBHr/YfJjbVikfY8Wzr0wNA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.124.tgz"; + sha512 = "Jj/I48WUvCUudNOJYslOXCFgPK+rg8x0JQdUpfUHh1YA2/uE9LheTHgm+yMg9BGlrfgulAUIc8bg3eUJlVNK0g=="; }; }; "consume-http-header-1.0.0" = { @@ -18339,13 +18294,13 @@ 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" = { @@ -22065,6 +22020,15 @@ let sha512 = "VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw=="; }; }; + "dompurify-2.3.1" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.1.tgz"; + sha512 = "xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw=="; + }; + }; "domutils-1.4.3" = { name = "domutils"; packageName = "domutils"; @@ -22596,13 +22560,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.801" = { + "electron-to-chromium-1.3.806" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.801"; + version = "1.3.806"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.801.tgz"; - sha512 = "xapG8ekC+IAHtJrGBMQSImNuN+dm+zl7UP1YbhvTkwQn8zf/yYuoxfTSAEiJ9VDD+kjvXaAhNDPSxJ+VImtAJA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.806.tgz"; + sha512 = "AH/otJLAAecgyrYp0XK1DPiGVWcOgwPeJBOLeuFQ5l//vhQhwC9u6d+GijClqJAmsHG4XDue81ndSQPohUu0xA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23444,6 +23408,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"; @@ -23651,15 +23624,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"; @@ -23669,15 +23633,6 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-config-prettier-8.3.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; - sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; - }; - }; "eslint-plugin-no-unsanitized-3.1.5" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -23687,15 +23642,6 @@ let sha512 = "s/6w++p1590h/H/dE2Wo660bOkaM/3OEK14Y7xm1UT0bafxkKw1Cq0ksjxkxLdH/WWd014DlsLKuD6CyNrR2Dw=="; }; }; - "eslint-plugin-prettier-3.4.0" = { - name = "eslint-plugin-prettier"; - packageName = "eslint-plugin-prettier"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; - sha512 = "UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw=="; - }; - }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -23786,6 +23732,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"; @@ -23840,6 +23795,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"; @@ -25127,13 +25091,13 @@ let sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; - "fast-json-patch-3.0.0-1" = { + "fast-json-patch-3.1.0" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "3.0.0-1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz"; - sha512 = "6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw=="; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz"; + sha512 = "IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -28161,13 +28125,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.10.0" = { + "globals-13.11.0" = { name = "globals"; packageName = "globals"; - version = "13.10.0"; + version = "13.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz"; - sha512 = "piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g=="; + url = "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz"; + sha512 = "08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g=="; }; }; "globals-9.18.0" = { @@ -28359,13 +28323,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.5.0" = { + "google-auth-library-7.6.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.5.0"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.5.0.tgz"; - sha512 = "iRMwc060kiA6ncZbAoQN90nlwT8jiHVmippofpMgo4YFEyRBaPouyM7+ZB742wKetByyy+TahshVRTx0tEyXGQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.6.1.tgz"; + sha512 = "aP/WTx+rE3wQ3zPgiCZsJ1EIb2v7P+QwxVwAqrKjcPz4SK57kyAfcX75VoAgjtwZzl70upcNlvFn8FSmC4nMBQ=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28377,22 +28341,22 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.22.1" = { + "google-gax-2.24.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.22.1"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.22.1.tgz"; - sha512 = "/X5Ym6f6Q4sH/3blMr1w/QzFhH0ZKnx9kOusUPwwZH6JmSwLpbuyUDbOc7MAvadl4r7yI2AASILLWK3fT+1Thg=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.0.tgz"; + sha512 = "PtE/Zk3jPrUIAL9YsIq5e+04U3aqEg6/0DmtR/tXKhbcS7SRA1sbPZja+vevuUavIdCXEiBbaKkrBqcQvSxXmw=="; }; }; - "google-p12-pem-3.1.1" = { + "google-p12-pem-3.1.2" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.1.tgz"; - sha512 = "e9CwdD2QYkpvJsktki3Bm8P8FSGIneF+/42a9F9QHcQvJ73C2RoYZdrwRl6BhwksWtzl65gT4OnBROhUIFw95Q=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz"; + sha512 = "tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A=="; }; }; "goosig-0.10.0" = { @@ -28791,13 +28755,13 @@ let sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; - "gtoken-5.3.0" = { + "gtoken-5.3.1" = { name = "gtoken"; packageName = "gtoken"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.0.tgz"; - sha512 = "mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz"; + sha512 = "yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ=="; }; }; "guard-timeout-2.0.0" = { @@ -29628,6 +29592,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"; @@ -30421,13 +30394,13 @@ let sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; }; }; - "hyperbee-1.5.5" = { + "hyperbee-1.6.2" = { name = "hyperbee"; packageName = "hyperbee"; - version = "1.5.5"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.5.5.tgz"; - sha512 = "0zX5JzBgB0kW7stpq2RXiVxzETckGuXJX43hAD5Fom60NUvpnEl6Q2VGKGjfDET04FjPCZAqA08pM2JXa48LjQ=="; + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.2.tgz"; + sha512 = "0pn4srJRD8edAOfJpSsdYGO9bwteD+A9OzHjjZZrfIdWZXXwtg862Wi/6L6JZhJ9ITfhlkEZTYJnOwi+wNwWqA=="; }; }; "hypercore-7.7.1" = { @@ -31987,13 +31960,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.3" = { + "is-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz"; - sha512 = "ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; }; }; "is-binary-path-1.0.1" = { @@ -33688,13 +33661,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.1.6" = { + "jitdb-3.1.7" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.6.tgz"; - sha512 = "FnOJmSyz/z4GfULcJSuvGfHlXFuosXws77GnR9M7wgCH/KAE5TovcQkjbFt5x69o6myacPYdzWr8yHVLJMuKWA=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.7.tgz"; + sha512 = "AV5AnBPlrQO75I3MKJFQMzQyM0ZQDwKcij299C1kBXt/U7dDqwQa8FaYYiHnbK8w9J4qXsvQOlM8P5HGY24zBQ=="; }; }; "jju-1.4.0" = { @@ -34102,49 +34075,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.320" = { + "jsii-srcmak-0.1.326" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.320"; + version = "0.1.326"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.320.tgz"; - sha512 = "+XiaSKCrauom9xazpWr7O8pAEEDrrW1qYJ6O0vHG4YKZxJYJN7md6qwAurk3iamwtyuIW/Io2XEnB6ZypAk3bw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.326.tgz"; + sha512 = "euZGdUcdZHI/cycrBZ7AVDea7Du2qu7TIzctEXUDuubtZ/n66rxWCQnlo/NsaQYx4HXkY47xaoVlRg69lhciZA=="; }; }; "json-bigint-1.0.0" = { @@ -34444,13 +34417,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.290" = { + "json2jsii-0.1.296" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.290"; + version = "0.1.296"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.290.tgz"; - sha512 = "r6Ab98tTR1NiD385ce5VpwH98Frhhmg7Kzq0t1Vte4FEx0icDcZIDIngqOoQWpMTMYFctTNggrswxkAvFeFBVA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.296.tgz"; + sha512 = "sr2xUhMuUMMtDqxckludB4fZ+64xJ8K+HODXVO/jbkv0QND5I8PmHwz0IqjqGkpUNHqJkYvXzn06tgXy/V1WeQ=="; }; }; "json3-3.2.6" = { @@ -34714,13 +34687,13 @@ let sha512 = "dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A=="; }; }; - "jstat-1.9.4" = { + "jstat-1.9.5" = { name = "jstat"; packageName = "jstat"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz"; - sha512 = "IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ=="; + url = "https://registry.npmjs.org/jstat/-/jstat-1.9.5.tgz"; + sha512 = "cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ=="; }; }; "jstransform-10.1.0" = { @@ -35831,15 +35804,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"; @@ -35858,13 +35822,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" = { @@ -36020,15 +35984,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"; @@ -36047,22 +36002,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" = { @@ -36074,13 +36020,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" = { @@ -38099,13 +38045,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" = { @@ -41429,6 +41375,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "nanoid-3.1.25" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; + sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; + }; + }; "nanoiterator-1.2.1" = { name = "nanoiterator"; packageName = "nanoiterator"; @@ -41853,13 +41808,22 @@ let sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; - "netlify-redirect-parser-8.2.0" = { + "netlify-headers-parser-2.1.1" = { + name = "netlify-headers-parser"; + packageName = "netlify-headers-parser"; + version = "2.1.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=="; + }; + }; + "netlify-redirect-parser-11.0.1" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "8.2.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz"; - sha512 = "XaCojsgAKs19vlT2C4CEs4bp166bBsgA/brt10x2HLsgp4tF3dSacClPfZgGknyHB1MnMK8j3SFp9yq6rYm8CQ=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.1.tgz"; + sha512 = "CSIff1lGEA9dn86pnHfsAPei3wr1LfE+vv+XwWO3wStd7kQ1my2bgUxttFBEJDK5YdW+sb7v1285HKm48XZhhw=="; }; }; "netlify-redirector-0.2.1" = { @@ -42186,6 +42150,15 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; + "node-emoji-1.11.0" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz"; + sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A=="; + }; + }; "node-emoji-git+https://github.com/laurent22/node-emoji.git" = { name = "node-emoji"; packageName = "node-emoji"; @@ -43889,13 +43862,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" = { @@ -46499,6 +46472,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"; @@ -46986,15 +46968,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"; @@ -47679,13 +47652,13 @@ let sha512 = "7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ=="; }; }; - "prebuild-install-6.1.3" = { + "prebuild-install-6.1.4" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "6.1.3"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz"; - sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; }; "precinct-8.1.0" = { @@ -47832,15 +47805,6 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-linter-helpers-1.0.0" = { - name = "prettier-linter-helpers"; - packageName = "prettier-linter-helpers"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; - }; - }; "prettier-plugin-svelte-2.3.1" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -48543,13 +48507,13 @@ let sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; }; }; - "protocol-buffers-schema-3.5.1" = { + "protocol-buffers-schema-3.5.2" = { name = "protocol-buffers-schema"; packageName = "protocol-buffers-schema"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz"; - sha512 = "YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw=="; + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.2.tgz"; + sha512 = "LPzSaBYp/TcbuSlpGwqT5jR9kvJ3Zp5ic2N5c2ybx6XB/lSfEHq2D7ja8AgoxHoMD91wXFALJoXsvshKPuXyew=="; }; }; "protocols-1.4.8" = { @@ -49623,13 +49587,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" = { @@ -50433,13 +50397,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.14.0" = { + "react-devtools-core-4.15.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.14.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.14.0.tgz"; - sha512 = "cE7tkSUkGCDxTA79pntDGJCBgzNN/XxA3kgPdXujdfSfEfVhzrItQIEsN0kCN/hJJACDvH2Q8p5+tJb/K4B3qA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.15.0.tgz"; + sha512 = "Y1NwrWSKRg4TtwcES2upzXFDmccAW9jrGQG2D8EGQrZhK+0hmuhgFnSdKpFc3z04CSeDT5t83RMXcmX5TkR1dA=="; }; }; "react-dom-16.14.0" = { @@ -51162,13 +51126,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.55" = { + "redoc-2.0.0-rc.56" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.55"; + version = "2.0.0-rc.56"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.55.tgz"; - sha512 = "32sUHhc33m8zQKz2V7xREwlf05S52dDOkn7K0WMquu2GDl6ZquxmrQfqnlj0IPoVCWQPR+XosmmIJj4rZbqjeA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.56.tgz"; + sha512 = "ir2TtQ2d/1FqZWIoLmUZ3qvAAnO6jg8dt0SV75TanmfCXpEABcElXWH3mtUf6qKlvgDVt40diDCVuSvyPPxkAw=="; }; }; "reduce-component-1.0.1" = { @@ -54717,13 +54681,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" = { @@ -54807,13 +54771,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.42.0" = { + "simple-git-2.44.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.42.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.42.0.tgz"; - sha512 = "illpUX0bcrdB3AyvBGLz0ToRVP7lXNJOGVybGVuVk7PpivPNK5YKJx2aagKdKbveaMtt0DCLK4/jfjDb6b2M2g=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.44.0.tgz"; + sha512 = "wIjcAmymhzgdaM0Y/a+XxmNGlivvHQTPZDYXVmyHMShVDwdeVqu3+OOyDbYu0DnfVzqLs2EOxRTgMNbC3YquwQ=="; }; }; "simple-handshake-3.0.0" = { @@ -55293,13 +55257,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.22.1" = { + "snyk-docker-plugin-4.23.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.22.1"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.22.1.tgz"; - sha512 = "fpXGkBu69Vb5meSrq0KjSKr0nlibA8z18fuH/O8HuDh1b5XyqKNz412njybpJtW07JPpA9rKX9gewRBZWch6fQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.23.0.tgz"; + sha512 = "hcQnDH6kN+Q9FU5/ulqfS/zmrM3YYM5cuCBjU9SZlDE/U3kpqDFePqHPmDdUBuQCdT0/3Os5A3qyg9Y7iNz8fg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -55356,22 +55320,22 @@ let sha512 = "fSjer9Ic8cdA2HvInUmhwbAhoLFXIokAzGB1PeGKwr0zzyfo3dSX3ReTMEbkhrEg+h0eES13px/KiiJ0EKRKMg=="; }; }; - "snyk-nodejs-lockfile-parser-1.35.1" = { + "snyk-nodejs-lockfile-parser-1.36.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.35.1"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.35.1.tgz"; - sha512 = "NiXN+MdWaZxseXVDgCM4CZ5aBgI5LloUbwUP9c3oMZDih9Zj6Vf5edDcL8eM3BGl+a6LceJzB6w+xrIqKCXgQA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.36.0.tgz"; + 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" = { @@ -55392,13 +55356,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" = { @@ -55464,13 +55428,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" = { @@ -56778,13 +56742,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.41" = { + "sscaff-1.2.47" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.41"; + version = "1.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.41.tgz"; - sha512 = "l0TA0Wp/06N+P9qrpX70/ueNOukRkfF3aasxtfVSbvrwy2gi8xCA31/rTtJ/Kb2OcqU1vdxWIDUOB82JCG+wqg=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.47.tgz"; + sha512 = "0SSqDSLkF9sRHwO6g80D74S5iAqupqcG9EsHCv4BRvwlrqu2Jr3ury5PF0tyyA2wPZejwHZ+u5XgEo8GIVQ6rA=="; }; }; "ssh-config-1.1.6" = { @@ -58957,13 +58921,13 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; - "tar-4.4.16" = { + "tar-4.4.17" = { name = "tar"; packageName = "tar"; - version = "4.4.16"; + version = "4.4.17"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.16.tgz"; - sha512 = "gOVUT/KWPkGFZQmCRDVFNUWBl7niIo/PRR7lzrIqtZpit+st54lGROuVjc6zEQM9FhH+dJfQIl+9F0k8GNXg5g=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.17.tgz"; + sha512 = "q7OwXq6NTdcYIa+k58nEMV3j1euhDhGCs/VRw9ymx/PbH0jtIM2+VTgDE/BW3rbLkrBUXs5fzEKgic5oUciu7g=="; }; }; "tar-4.4.6" = { @@ -58993,13 +58957,13 @@ let sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; }; }; - "tar-6.1.7" = { + "tar-6.1.8" = { name = "tar"; packageName = "tar"; - version = "6.1.7"; + version = "6.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.7.tgz"; - sha512 = "PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.8.tgz"; + sha512 = "sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A=="; }; }; "tar-fs-1.16.3" = { @@ -60802,13 +60766,13 @@ let sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; }; }; - "tslib-2.3.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; - sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "tslint-5.20.1" = { @@ -61207,13 +61171,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-rest-client-1.8.4" = { + "typed-rest-client-1.8.5" = { name = "typed-rest-client"; packageName = "typed-rest-client"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.4.tgz"; - sha512 = "MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg=="; + url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.5.tgz"; + sha512 = "952/Aegu3lTqUAI1anbDLbewojnF/gh8at9iy1CIrfS1h/+MtNjB1Y9z6ZF5n2kZd+97em56lZ9uu7Zz3y/pwg=="; }; }; "typed-styles-0.0.7" = { @@ -63854,13 +63818,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.0.1" = { + "vfile-message-3.0.2" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.0.1.tgz"; - sha512 = "gYmSHcZZUEtYpTmaWaFJwsuUD70/rTY4v09COp8TGtOkix6gGxb/a8iTQByIY9ciTk9GwAwIXd/J9OPfM4Bvaw=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.0.2.tgz"; + sha512 = "UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww=="; }; }; "vfile-reporter-1.5.0" = { @@ -64934,15 +64898,6 @@ let sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; - "web-tree-sitter-0.16.4" = { - name = "web-tree-sitter"; - packageName = "web-tree-sitter"; - version = "0.16.4"; - src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.4.tgz"; - sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; - }; - }; "web-tree-sitter-0.17.1" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -64952,13 +64907,22 @@ let sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; }; }; - "web3-utils-1.5.1" = { + "web-tree-sitter-0.19.4" = { + name = "web-tree-sitter"; + packageName = "web-tree-sitter"; + version = "0.19.4"; + src = fetchurl { + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.19.4.tgz"; + sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; + }; + }; + "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" = { @@ -65078,13 +65042,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" = { @@ -65258,13 +65222,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" = { @@ -66086,13 +66050,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" = { @@ -66464,6 +66428,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"; @@ -66852,6 +66826,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"; @@ -67113,13 +67096,13 @@ let sha512 = "XIJoCQDNlttjFubWL+tpf+t1MkFUdsqwtJvR2qhfzhHi8Z7ZzAwiBPgCtTiLK1mwPTfqzV/V0E9l7zX7hrhBdg=="; }; }; - "yeoman-generator-5.4.0" = { + "yeoman-generator-5.4.1" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.0.tgz"; - sha512 = "ZOzoe8pAenTw8q7X3TdG3u5S7EM/ErCNue7Jvcb/ZDfank6Nnu3J249PtgTbyAuN+VYVZ/VVFIAJxjlrqJpldQ=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.1.tgz"; + sha512 = "ZlO++ByvxiapJo3TZy1/Bx5S2LRnNoQ7IMnJRjMtP6bWP1BldfoPMJAP4PztQOc6okufBFDUVR9Yjt6MB2G9YA=="; }; }; "yesno-0.3.1" = { @@ -67299,22 +67282,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.0"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.0.tgz"; - sha512 = "gxw4e3Wb1YgNE+f9sX90xea5vXatqvlYq3mOWFUWVKYcayAgnt9z97a1ULEkSytS1aVjyL44zzkU/QFufPpadQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.1.tgz"; + sha512 = "D0SMVRLEYOEJYaxWm4a5TjQzfQt4BI8R9Dz/Dk/FNFtiuFyaRgbrFgicLF8ePyHWzmHi+KN9i5bgBcWMEtY5SQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.0" - sources."@angular-devkit/core-12.2.0" - sources."@angular-devkit/schematics-12.2.0" + sources."@angular-devkit/architect-0.1202.1" + sources."@angular-devkit/core-12.2.1" + sources."@angular-devkit/schematics-12.2.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.2.0" + sources."@schematics/angular-12.2.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -67535,7 +67518,7 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."through-2.3.8" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" @@ -68091,7 +68074,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -68240,7 +68223,7 @@ in sources."hrpc-2.2.0" sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" - sources."hyperbee-1.5.5" + sources."hyperbee-1.6.2" sources."hypercore-9.10.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ @@ -68281,7 +68264,7 @@ in sources."inspect-custom-symbol-1.1.1" sources."internal-slot-1.0.3" sources."ipv4-peers-2.0.0" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" @@ -68401,7 +68384,7 @@ in sources."progress-string-1.2.2" sources."protocol-buffers-4.2.0" sources."protocol-buffers-encodings-1.1.1" - sources."protocol-buffers-schema-3.5.1" + sources."protocol-buffers-schema-3.5.2" sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -68625,7 +68608,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -68664,7 +68647,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -68691,7 +68674,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -68964,9 +68947,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -69002,7 +68985,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -69037,14 +69020,14 @@ in sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.15.0" - (sources."@babel/register-7.14.5" // { + (sources."@babel/register-7.15.3" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -69100,7 +69083,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -69115,13 +69098,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.1" // { + (sources."@vue/compiler-core-3.2.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.1" - sources."@vue/shared-3.2.1" + sources."@vue/compiler-dom-3.2.2" + sources."@vue/shared-3.2.2" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69243,7 +69226,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -69371,7 +69354,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.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69508,7 +69491,7 @@ in sources."graphql-subscriptions-1.2.1" (sources."graphql-tag-2.12.5" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."graphql-tools-4.0.8" @@ -69563,7 +69546,7 @@ in sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" @@ -69615,7 +69598,7 @@ in sources."ast-types-0.14.2" sources."recast-0.20.5" sources."source-map-0.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."jsesc-2.5.2" @@ -70270,7 +70253,7 @@ in sources."@babel/generator-7.15.0" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/types-7.15.0" sources."@webassemblyjs/ast-1.11.1" @@ -70371,9 +70354,9 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -70384,7 +70367,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.7" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -70395,7 +70378,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.801" + sources."electron-to-chromium-1.3.806" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70489,7 +70472,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -70524,9 +70507,9 @@ in }; dependencies = [ sources."browserslist-4.16.7" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."colorette-1.3.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.74" @@ -70553,14 +70536,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.964.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -70728,7 +70711,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."toidentifier-1.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-check-0.3.2" sources."type-fest-0.21.3" (sources."unbzip2-stream-1.3.3" // { @@ -70764,10 +70747,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.6"; + version = "10.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.6.tgz"; - sha512 = "dzYzWcLVcwbHwKfTp60ml7IYvWOmX6rD2rC/J9A2HT6VzefbcQ4/59YdzoPRhdlvmhblvj17jwExN0xQxOQJhQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.8.tgz"; + sha512 = "lBtaJP9EmDdvaYcsjvKhkS84sG79uZwhhoZ/Xb8Onj1FS8zwLPWFqzpRZ1SJ32COq9aJUWumLD+6LCnWH6Xbsg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -70780,7 +70763,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -70844,8 +70827,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" @@ -70946,7 +70933,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" @@ -71027,6 +71014,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" @@ -71122,13 +71110,14 @@ in sources."json2csv-5.0.6" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."jstat-1.9.4" + sources."jstat-1.9.5" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" (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" @@ -71142,6 +71131,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" @@ -71150,20 +71140,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" // { @@ -71174,42 +71162,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" @@ -71230,7 +71192,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" @@ -71307,6 +71269,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" @@ -71324,6 +71287,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" @@ -71333,7 +71297,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" ]; }) sources."proxy-addr-2.0.7" @@ -71523,10 +71487,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.17.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.17.0.tgz"; - sha512 = "t80ktUFL9DPaTO7yydoNYXIDKINweWbFvvUXesltmWj7UaIyepIVRAWUp4+62udJtor1VxVFEAXnsVDA640flw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-2.0.0.tgz"; + sha512 = "yp6KF2GCVgj64kU2qknE+CFydb8IHc+2ZTRFc6UrN8FugOAHEfO7PzkxfJ/SDWbqa7wIJyjdEFtbTOy/qbHtbQ=="; }; dependencies = [ sources."abab-2.0.5" @@ -71640,7 +71604,7 @@ in sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" sources."w3c-hr-time-1.0.2" - sources."web-tree-sitter-0.16.4" + sources."web-tree-sitter-0.19.4" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" @@ -72087,7 +72051,7 @@ in sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" @@ -72219,7 +72183,7 @@ in sources."@babel/code-frame-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/types-7.15.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -72591,7 +72555,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.42.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" @@ -72681,7 +72645,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -73083,13 +73047,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.35"; + version = "1.0.0-beta.37"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.35.tgz"; - sha512 = "gmIhIZyAJyEi/2GV6wmLF/HGswJK+pxWijH1jS/WPgcJHRaeaIMysrdsCWpucVA6Zz/OwgrmG1Fp09gZAKdskw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.37.tgz"; + 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" @@ -73100,9 +73065,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" ]; @@ -73110,8 +73076,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.118" + sources."commonmark-0.30.0" + sources."constructs-3.3.124" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73142,11 +73108,12 @@ 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" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -73162,37 +73129,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.320" // { + (sources."jsii-srcmak-0.1.326" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.290" + sources."json2jsii-0.1.296" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73208,7 +73175,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" @@ -73228,7 +73195,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.41" + sources."sscaff-1.2.47" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -73239,7 +73206,8 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.0" - sources."tslib-2.3.0" + sources."supports-color-7.2.0" + sources."tslib-2.3.1" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" sources."universalify-2.0.0" @@ -73249,7 +73217,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" @@ -73304,7 +73272,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/types-7.15.0" sources."@cdktf/hcl2cdk-0.5.0" @@ -73329,16 +73297,15 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.1.8" // { + (sources."@graphql-tools/mock-8.2.1" // { dependencies = [ - sources."@graphql-tools/merge-7.0.0" - sources."@graphql-tools/utils-8.0.2" + sources."@graphql-tools/utils-8.1.1" ]; }) - (sources."@graphql-tools/schema-8.0.3" // { + (sources."@graphql-tools/schema-8.1.1" // { dependencies = [ - sources."@graphql-tools/merge-7.0.0" - sources."@graphql-tools/utils-8.0.2" + sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/utils-8.1.1" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -73348,7 +73315,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" @@ -73403,7 +73371,7 @@ in sources."apollo-server-caching-3.0.1" (sources."apollo-server-core-3.1.2" // { dependencies = [ - sources."@graphql-tools/utils-8.0.2" + sources."@graphql-tools/utils-8.1.1" ]; }) sources."apollo-server-env-4.0.3" @@ -73484,14 +73452,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.118" + sources."constructs-3.3.124" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73632,7 +73600,7 @@ in sources."internal-slot-1.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" @@ -73663,35 +73631,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.320" // { + (sources."jsii-srcmak-0.1.326" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73756,7 +73724,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" @@ -73792,7 +73760,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-16.14.0" - sources."react-devtools-core-4.14.0" + sources."react-devtools-core-4.15.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -73849,7 +73817,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.41" + sources."sscaff-1.2.47" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -73889,7 +73857,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."ts-invariant-0.9.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-fest-0.15.1" sources."type-is-1.6.18" sources."typescript-3.9.10" @@ -73921,7 +73889,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" @@ -74227,10 +74195,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.21.0"; + version = "0.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.0.tgz"; - sha512 = "donSKELS/XuVyTpYrfuQDXej340xKZDknKyek4+4ThDYU7Xh5mVeITarDEbi882su0xQBYQsSSwy3zYDocQy7w=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.21.2.tgz"; + sha512 = "KqwsIOrPFWgrNA16PAosZlpHLdfv9YpxcaKGcPBpCRFl+QZqOlrxlHnPLb+8jsLLrxo8QnROa+6RWoCUZWo9Rw=="; }; buildInputs = globalBuildInputs; meta = { @@ -74398,7 +74366,7 @@ in dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" sources."which-2.0.2" @@ -74589,7 +74557,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" @@ -74660,7 +74628,7 @@ in sources."ini-1.3.8" sources."int64-buffer-0.1.10" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -74740,9 +74708,9 @@ in sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."traverse-0.3.9" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."unbox-primitive-1.0.1" sources."universalify-0.1.2" sources."unzipper-0.10.11" @@ -74878,7 +74846,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -74976,7 +74944,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75117,7 +75085,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."globals-13.10.0" + sources."globals-13.11.0" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -75775,13 +75743,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 = { @@ -75855,10 +75823,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.48.0"; + version = "0.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.48.0.tgz"; - sha512 = "qI+bODEl34n6dFTrbQoc5kjXhRUCLxVhfs0TFvz3iqKBj4Yz9lI5fYxH76DXce9ETlTQNQDt1XQVycC5pPyUdA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.49.0.tgz"; + sha512 = "NVERNgvvYwGR4sIopZhMbUkRpr0uaGTukU6BWgUvt6BZghn+Es25xqDmruuZK5iXt8Kvd77jM2XkqXImHJDyWQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -75891,10 +75859,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 = { @@ -75948,13 +75916,13 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -75987,7 +75955,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -76025,7 +75993,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76512,7 +76480,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -77401,7 +77369,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."systeminformation-4.34.23" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -77492,7 +77460,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -77863,7 +77831,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -78876,9 +78844,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -78913,7 +78881,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -78949,7 +78917,7 @@ in sources."@babel/preset-env-7.15.0" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -78983,11 +78951,11 @@ in sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.1.0" - sources."@types/react-16.14.12" + sources."@types/react-16.14.13" sources."@types/react-dom-16.9.14" sources."@types/react-virtualized-9.21.13" sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.3" + sources."@types/url-parse-1.4.4" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -79036,7 +79004,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -79106,7 +79074,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.1.9" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -79328,7 +79296,7 @@ in sources."progress-2.0.3" sources."prop-types-15.7.2" sources."proto-list-1.2.4" - sources."protocol-buffers-schema-3.5.1" + sources."protocol-buffers-schema-3.5.2" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qr.js-0.0.0" @@ -79893,7 +79861,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -80244,7 +80212,7 @@ in (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.16" + sources."tar-4.4.17" ]; }) sources."nopt-4.0.3" @@ -80391,7 +80359,7 @@ in sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" @@ -80528,9 +80496,9 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -80546,7 +80514,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -80581,7 +80549,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -80618,7 +80586,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -80752,7 +80720,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.14.0" + sources."react-devtools-core-4.15.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -80886,7 +80854,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.197" + sources."@microsoft/load-themed-styles-1.10.202" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -81128,7 +81096,7 @@ in sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."tar-6.1.7" + sources."tar-6.1.8" ]; }) sources."cache-base-1.0.1" @@ -82319,7 +82287,7 @@ in sources."swagger-ui-dist-3.34.0" sources."tail-2.2.3" sources."tapable-1.1.3" - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."mkdirp-0.5.5" sources."safe-buffer-5.2.1" @@ -82639,7 +82607,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -82803,7 +82771,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -82946,13 +82914,13 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" @@ -82971,7 +82939,7 @@ in sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -83367,12 +83335,12 @@ in sources."callsites-2.0.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -83628,7 +83596,7 @@ in }) (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."dot-prop-5.3.0" @@ -83637,7 +83605,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.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -83937,7 +83905,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -84083,7 +84051,7 @@ in sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."lowercase-keys-2.0.0" @@ -84210,7 +84178,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."nocache-2.1.0" @@ -84361,7 +84329,7 @@ in sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."parse-asn1-5.1.6" @@ -84371,7 +84339,7 @@ in sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."pascalcase-0.1.1" @@ -84890,7 +84858,7 @@ in }) sources."symbol-observable-1.2.0" sources."tapable-1.1.3" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" @@ -85288,9 +85256,9 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -85301,7 +85269,7 @@ in sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -85328,7 +85296,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -85353,7 +85321,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -85447,7 +85415,7 @@ in sources."puppeteer-9.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.14.0" + sources."react-devtools-core-4.15.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -85538,24 +85506,12 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.4.tgz"; - sha512 = "KqaoGSmcIBLY6Vr1wWRMu0acuLUpxpKEtjekdwYs+JxMk74vRa8Mwxd96SmEoBat28cPCoLAPfvDyEtzUzkjEg=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.5.tgz"; + sha512 = "yDfb49A/9LCm7/xwk7zRzcjzt4w6FKUPLtSy+sRuOA9h26sNwhh4CYOqj57VOF+N7G55XFixEb0/FGKvDl7AyA=="; }; dependencies = [ - sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.15.0" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" - sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -85577,7 +85533,7 @@ in (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.4" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."@oclif/core-0.5.29" // { @@ -85594,7 +85550,7 @@ in sources."has-flag-4.0.0" sources."jsonfile-6.1.0" sources."supports-color-7.2.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -85651,7 +85607,6 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."babel-eslint-10.1.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -85660,6 +85615,11 @@ in }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."bluebird-3.7.2" (sources."boxen-5.0.1" // { dependencies = [ @@ -85672,6 +85632,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."btoa-lite-1.0.0" + sources."buffer-5.7.1" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -85690,6 +85651,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) + sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -85709,7 +85671,9 @@ in }) sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" sources."cli-progress-3.9.0" + sources."cli-spinners-2.6.0" (sources."cli-table-0.3.6" // { dependencies = [ sources."colors-1.0.3" @@ -85733,6 +85697,8 @@ in sources."supports-hyperlinks-1.0.1" ]; }) + sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."co-4.6.0" sources."collection-visit-1.0.0" @@ -85755,6 +85721,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.3" + sources."defaults-1.0.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" @@ -85763,14 +85730,7 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."eslint-config-prettier-8.3.0" - sources."eslint-plugin-prettier-3.4.0" - sources."eslint-visitor-keys-1.3.0" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -85802,6 +85762,7 @@ in sources."is-extendable-1.0.1" ]; }) + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -85811,7 +85772,6 @@ in sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.2.0" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" @@ -85823,6 +85783,11 @@ in sources."supports-color-7.2.0" ]; }) + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -85832,7 +85797,6 @@ in sources."from2-2.3.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" @@ -85840,7 +85804,6 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" - sources."globals-11.12.0" (sources."globby-8.0.2" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -85875,7 +85838,6 @@ in sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" @@ -85904,15 +85866,23 @@ in sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."hyperlinker-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -85920,6 +85890,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" @@ -85927,6 +85898,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -85934,10 +85906,8 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -85951,6 +85921,13 @@ in sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."map-cache-0.2.2" @@ -85959,6 +85936,7 @@ in sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -85968,6 +85946,7 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" + sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" (sources."netrc-parser-3.1.6" // { @@ -85998,8 +85977,17 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" sources."opn-3.0.3" sources."optionator-0.8.3" + (sources."ora-5.4.1" // { + dependencies = [ + sources."chalk-4.1.2" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."os-tmpdir-1.0.2" sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" @@ -86013,7 +86001,6 @@ in sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -86022,7 +86009,6 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettier-2.3.2" - sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -86041,12 +86027,18 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" + sources."run-async-2.4.1" sources."run-parallel-1.2.0" + (sources."rxjs-7.3.0" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -86078,6 +86070,7 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -86091,7 +86084,7 @@ in ]; }) sources."sort-keys-2.0.0" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-string-3.1.0" @@ -86131,8 +86124,9 @@ in sources."supports-color-7.2.0" ]; }) + sources."through-2.3.8" sources."timed-out-4.0.1" - sources."to-fast-properties-2.0.0" + sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -86167,6 +86161,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" + sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-3.1.0" sources."word-wrap-1.2.3" @@ -86187,10 +86182,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.16.0"; + version = "9.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.0.tgz"; - sha512 = "H/zyDDrQuZKM6ZFyI8t2kDEC+/Ewhk771sM8NLZyEXIQnX5qKAwhi3sJUB+5yrXt+SJQYqUYksBLK6/gqxe9Eg=="; + 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" // { @@ -86203,9 +86198,9 @@ 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.1" // { + (sources."@google-cloud/pubsub-2.16.3" // { dependencies = [ - sources."google-auth-library-7.5.0" + sources."google-auth-library-7.6.1" ]; }) sources."@grpc/grpc-js-1.3.7" @@ -86217,7 +86212,7 @@ in ]; }) sources."@opentelemetry/api-1.0.2" - sources."@opentelemetry/semantic-conventions-0.22.0" + sources."@opentelemetry/semantic-conventions-0.24.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -86237,7 +86232,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -86327,7 +86322,7 @@ in (sources."cacache-15.2.0" // { dependencies = [ sources."mkdirp-1.0.4" - sources."tar-6.1.7" + sources."tar-6.1.8" ]; }) (sources."cacheable-request-6.1.0" // { @@ -86586,15 +86581,15 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.22.1" // { + (sources."google-gax-2.24.0" // { dependencies = [ - sources."google-auth-library-7.5.0" + sources."google-auth-library-7.6.1" ]; }) - sources."google-p12-pem-3.1.1" + sources."google-p12-pem-3.1.2" sources."got-9.6.0" sources."graceful-fs-4.2.8" - sources."gtoken-5.3.0" + sources."gtoken-5.3.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { @@ -86726,7 +86721,6 @@ in sources."lodash.keys-2.4.1" sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" - sources."lodash.toarray-4.4.0" sources."lodash.union-4.6.0" sources."lodash.values-2.4.1" sources."log-symbols-2.2.0" @@ -86789,14 +86783,14 @@ in sources."netmask-2.0.2" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."node-fetch-2.6.1" sources."node-forge-0.10.0" (sources."node-gyp-8.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."which-2.0.2" ]; }) @@ -86977,7 +86971,7 @@ in sources."has-flag-2.0.0" ]; }) - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -87011,7 +87005,7 @@ in sources."toxic-1.0.1" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."tweetsodium-0.0.5" // { @@ -87344,7 +87338,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -87517,7 +87511,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" @@ -87724,7 +87718,7 @@ in sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -88073,13 +88067,13 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -88087,8 +88081,8 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" - sources."@babel/runtime-7.14.8" - sources."@babel/standalone-7.15.2" + sources."@babel/runtime-7.15.3" + sources."@babel/standalone-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -88127,7 +88121,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -88194,7 +88188,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -88290,7 +88284,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -88809,13 +88803,13 @@ in sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.5.0" + 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/request-5.6.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" @@ -88941,7 +88935,7 @@ in }) sources."wrappy-1.0.2" sources."yallist-4.0.0" - (sources."yeoman-generator-5.4.0" // { + (sources."yeoman-generator-5.4.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -89261,7 +89255,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" @@ -89658,7 +89652,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) ]; @@ -89667,14 +89661,14 @@ in (sources."@graphql-tools/merge-6.2.17" // { dependencies = [ sources."@graphql-tools/utils-8.0.2" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.0.3" // { + (sources."@graphql-tools/schema-8.1.1" // { dependencies = [ - sources."@graphql-tools/merge-7.0.0" - sources."@graphql-tools/utils-8.0.2" - sources."tslib-2.3.0" + sources."@graphql-tools/merge-8.0.1" + sources."@graphql-tools/utils-8.1.1" + sources."tslib-2.3.1" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { @@ -89704,7 +89698,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -89892,7 +89886,7 @@ in sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -89955,7 +89949,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."lowercase-keys-1.0.1" @@ -89982,7 +89976,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."node-emoji-1.10.0" @@ -89996,7 +89990,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" @@ -90040,7 +90034,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."passwd-user-3.0.0" @@ -90109,7 +90103,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" @@ -90422,7 +90416,6 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."lodash-4.17.21" - sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-2.1.3" (sources."marked-terminal-4.1.1" // { @@ -90434,7 +90427,7 @@ in }) sources."memory-streams-0.1.3" sources."memorystream-0.3.1" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."nopt-2.1.2" sources."optimist-0.3.7" sources."picture-tuber-1.0.2" @@ -92098,7 +92091,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."astral-regex-2.0.0" @@ -92339,7 +92332,7 @@ in ]; }) sources."supports-color-7.2.0" - sources."tar-4.4.16" + sources."tar-4.4.17" sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" @@ -92555,7 +92548,7 @@ in sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-check-0.3.2" sources."typo-geom-0.12.1" sources."unicoderegexp-0.4.1" @@ -92569,7 +92562,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" @@ -92720,20 +92713,27 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.2.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.2.1.tgz"; - sha512 = "6meo5eWRPmmZACLY+5atvtaecNsclzxcwYeFOUyAPf1JctSH/nCGow2nVkZoLtwNJGgXAnIEzwn08CpNIecDEQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.3.2.tgz"; + sha512 = "Gg0s1NP2mRJqzv68aT8cdt2+71iSYLDTWusAmlX7c8g13ZniSzCEHXywFvpILYm76lzCWxMazPleZhEEuBjqxQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" (sources."@babel/core-7.15.0" // { dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" sources."semver-6.3.0" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.15.0" // { + dependencies = [ + sources."source-map-0.5.7" ]; }) - sources."@babel/generator-7.15.0" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.15.0" // { dependencies = [ @@ -92755,17 +92755,15 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { 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."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -92778,58 +92776,68 @@ in sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-typescript-7.15.0" - sources."@babel/register-7.14.5" + sources."@babel/register-7.15.3" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" + (sources."@babel/traverse-7.15.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) 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.31" - sources."@joplin/fork-sax-1.2.35" - (sources."@joplin/lib-2.1.1" // { - dependencies = [ - (sources."@joplin/renderer-1.8.2" // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" - ]; - }) - ]; - }) - (sources."@joplin/renderer-2.1.1" // { + 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.53" // { + (sources."@joplin/turndown-4.0.55" // { dependencies = [ sources."css-2.2.4" - sources."source-map-0.6.1" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.35" + 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" - sources."@oclif/command-1.8.0" + (sources."@oclif/command-1.8.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."debug-4.3.2" + sources."ms-2.1.2" + sources."tslib-2.3.1" ]; }) (sources."@oclif/core-0.5.29" // { dependencies = [ + sources."ansi-regex-5.0.0" + sources."debug-4.3.2" sources."fs-extra-9.1.0" + sources."is-fullwidth-code-point-3.0.0" sources."jsonfile-6.1.0" + sources."ms-2.1.2" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) (sources."@oclif/errors-1.3.5" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" sources."strip-ansi-6.0.0" ]; }) @@ -92838,15 +92846,18 @@ in 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."@oclif/plugin-help-3.3.0" sources."@oclif/screen-1.0.4" - sources."@percy/config-1.0.0-beta.63" - sources."@percy/logger-1.0.0-beta.63" + (sources."@percy/config-1.0.0-beta.65" // { + dependencies = [ + sources."ajv-8.6.2" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."@percy/logger-1.0.0-beta.65" sources."@percy/migrate-0.10.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.5" @@ -92858,25 +92869,24 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-8.6.2" + sources."ajv-6.12.6" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" + sources."ansi-regex-2.1.1" + (sources."ansi-styles-4.3.0" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."ansicolors-0.3.2" sources."anymatch-3.1.2" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."are-we-there-yet-1.1.5" (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" @@ -92896,19 +92906,21 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.965.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" + sources."sax-1.2.1" sources."uuid-3.3.2" sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" ]; }) sources."aws-sign2-0.7.0" @@ -92919,6 +92931,7 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) sources."base-64-0.1.0" @@ -92926,7 +92939,11 @@ in sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - sources."bl-4.1.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -92935,12 +92952,16 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."builtin-modules-3.2.0" - sources."cache-base-1.0.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { @@ -92968,25 +92989,33 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) - (sources."clean-css-4.2.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."clean-css-4.2.3" sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" - sources."cli-progress-3.9.0" + (sources."cli-progress-3.9.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) sources."cli-spinners-2.6.0" (sources."cli-ux-5.6.3" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."fs-extra-8.1.0" sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."jsonfile-4.0.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-8.1.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-3.0.0" @@ -92995,20 +93024,15 @@ in sources."clone-deep-4.0.1" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - (sources."color-3.1.2" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.6.0" sources."colorette-1.3.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" - sources."commander-6.2.1" + sources."commander-2.17.1" sources."commondir-1.0.1" sources."compare-version-0.1.2" sources."compare-versions-3.6.0" @@ -93029,13 +93053,11 @@ in sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."which-2.0.2" ]; }) sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ - sources."source-map-0.6.1" sources."source-map-resolve-0.6.0" ]; }) @@ -93056,11 +93078,7 @@ in sources."d3-contour-1.3.2" sources."d3-dispatch-1.0.6" sources."d3-drag-1.2.5" - (sources."d3-dsv-1.2.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) + sources."d3-dsv-1.2.0" sources."d3-ease-1.0.7" sources."d3-fetch-1.2.0" sources."d3-force-1.2.1" @@ -93086,7 +93104,7 @@ in sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.3.2" + sources."debug-3.2.7" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -93094,7 +93112,11 @@ in sources."deepmerge-2.2.1" sources."defaults-1.0.3" sources."define-properties-1.1.3" - sources."define-property-2.0.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -93116,11 +93138,10 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."escape-string-regexp-1.0.5" @@ -93136,15 +93157,15 @@ in }) sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."error-ex-1.3.2" + (sources."error-ex-1.3.2" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."es6-promise-pool-2.5.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -93200,7 +93221,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" + sources."find-up-2.1.0" sources."flow-parser-0.157.0" sources."follow-redirects-1.14.1" sources."font-awesome-filetypes-2.1.0" @@ -93212,7 +93233,11 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" - sources."fs-extra-5.0.0" + (sources."fs-extra-5.0.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + ]; + }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -93220,9 +93245,6 @@ in sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; }) @@ -93242,22 +93264,17 @@ in sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" - sources."has-value-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."has-values-1.0.0" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -93269,14 +93286,10 @@ 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" // { - dependencies = [ - sources."commander-2.17.1" - ]; - }) + sources."html-minifier-3.5.21" sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."hyperlinker-1.0.0" @@ -93287,7 +93300,6 @@ in (sources."image-data-uri-2.0.1" // { dependencies = [ sources."fs-extra-0.26.7" - sources."jsonfile-2.4.0" ]; }) sources."image-type-3.1.0" @@ -93300,6 +93312,9 @@ in sources."ini-1.3.8" (sources."inquirer-8.1.2" // { dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93315,13 +93330,11 @@ in }) (sources."inspect-parameters-declaration-0.0.9" // { dependencies = [ - sources."commander-2.20.3" sources."magicli-0.0.5" ]; }) (sources."inspect-property-0.0.6" // { dependencies = [ - sources."commander-2.20.3" sources."inspect-function-0.3.4" (sources."inspect-parameters-declaration-0.0.8" // { dependencies = [ @@ -93338,13 +93351,9 @@ in }) sources."iota-array-1.0.0" sources."ip-regex-2.1.0" - (sources."is-absolute-0.2.6" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) + sources."is-absolute-0.2.6" sources."is-accessor-descriptor-1.0.0" - sources."is-arrayish-0.2.1" + sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" @@ -93352,17 +93361,21 @@ in sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-plain-object-2.0.4" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-relative-0.2.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-unicode-supported-0.1.0" - sources."is-windows-1.0.2" + sources."is-windows-0.2.0" sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { dependencies = [ @@ -93371,7 +93384,7 @@ in }) sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-js-0.4.3" @@ -93391,6 +93404,7 @@ in ]; }) sources."is-number-3.0.0" + sources."isobject-3.0.1" sources."kind-of-3.2.2" sources."micromatch-3.1.10" sources."to-regex-range-2.1.1" @@ -93400,12 +93414,16 @@ in sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-1.0.0" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.2.0" - sources."jsonfile-4.0.0" + sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - sources."katex-0.13.13" + (sources."katex-0.13.13" // { + dependencies = [ + sources."commander-6.2.1" + ]; + }) sources."keytar-7.7.0" sources."khroma-1.4.1" sources."kind-of-6.0.3" @@ -93414,8 +93432,8 @@ in sources."levenshtein-1.0.5" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" - sources."linkify-it-3.0.2" - sources."locate-path-3.0.0" + sources."linkify-it-2.2.0" + sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" sources."lodash._reinterpolate-3.0.0" @@ -93434,15 +93452,7 @@ in ]; }) sources."lru-cache-6.0.0" - (sources."magicli-0.0.8" // { - dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - ]; - }) + sources."magicli-0.0.8" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -93453,7 +93463,6 @@ in (sources."markdown-it-10.0.0" // { dependencies = [ sources."entities-2.0.3" - sources."linkify-it-2.2.0" ]; }) sources."markdown-it-abbr-1.0.4" @@ -93467,6 +93476,7 @@ in (sources."markdown-it-multimd-table-4.1.0" // { dependencies = [ sources."entities-2.0.3" + sources."linkify-it-3.0.2" sources."markdown-it-11.0.1" ]; }) @@ -93500,22 +93510,21 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multiparty-4.2.2" sources."mustache-4.2.0" sources."mute-stream-0.0.8" - sources."nanoid-3.1.23" - sources."nanomatch-1.2.13" + sources."nanoid-3.1.25" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."is-windows-1.0.2" + ]; + }) sources."napi-build-utils-1.0.2" sources."natural-orderby-2.0.3" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.8.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."sax-1.2.4" - ]; - }) + sources."needle-2.8.0" sources."neo-async-2.6.2" sources."nextgen-events-1.5.2" sources."nice-try-1.0.5" @@ -93528,20 +93537,20 @@ in sources."node-addon-api-3.2.1" sources."node-bitmap-0.0.1" sources."node-dir-0.1.17" - sources."node-emoji-1.10.0" + sources."node-emoji-1.11.0" sources."node-fetch-1.7.3" (sources."node-gyp-3.8.0" // { dependencies = [ sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.2" + sources."which-1.3.1" ]; }) sources."node-modules-regexp-1.0.0" (sources."node-notifier-8.0.2" // { dependencies = [ sources."uuid-8.3.2" - sources."which-2.0.2" ]; }) sources."node-persist-2.1.0" @@ -93577,15 +93586,22 @@ in sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ - sources."commander-2.20.3" sources."inspect-parameters-declaration-0.0.10" sources."magicli-0.0.5" ]; }) sources."object-treeify-1.1.33" - sources."object-visit-1.0.1" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.assign-4.1.2" - sources."object.pick-1.3.0" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."omggif-1.0.10" sources."once-1.4.0" sources."onetime-5.1.2" @@ -93593,15 +93609,16 @@ in sources."optionator-0.8.3" (sources."ora-5.4.1" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."strip-ansi-6.0.0" ]; }) sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."param-case-2.1.1" sources."parent-module-1.0.1" sources."parse-json-5.2.0" @@ -93612,6 +93629,7 @@ in sources."ansi-escapes-3.2.0" sources."cross-spawn-6.0.5" sources."semver-5.7.1" + sources."which-1.3.1" ]; }) sources."path-exists-3.0.0" @@ -93623,11 +93641,19 @@ in sources."pify-4.0.1" sources."pipe-functions-1.3.0" sources."pirates-4.0.1" - sources."pkg-dir-3.0.0" + (sources."pkg-dir-3.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) sources."pn-1.1.0" sources."pngjs-5.0.0" sources."posix-character-classes-0.1.1" - sources."prebuild-install-6.1.3" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -93649,12 +93675,15 @@ in sources."pify-3.0.0" ]; }) - sources."readable-stream-3.6.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readdirp-3.6.0" (sources."recast-0.20.5" // { dependencies = [ - sources."source-map-0.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."redeyed-2.1.1" @@ -93662,11 +93691,7 @@ in sources."redux-3.7.2" sources."regex-not-1.0.2" sources."relateurl-0.2.7" - (sources."relative-3.0.2" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) + sources."relative-3.0.2" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" (sources."request-2.88.2" // { @@ -93690,7 +93715,7 @@ in sources."ret-0.1.15" sources."retry-0.10.1" sources."reusify-1.0.4" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rw-1.3.3" @@ -93702,7 +93727,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" + sources."sax-1.2.4" sources."saxes-3.1.11" sources."semver-7.3.5" sources."server-destroy-1.0.1" @@ -93719,8 +93744,6 @@ in (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" @@ -93732,11 +93755,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) + sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -93761,11 +93780,13 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -93773,13 +93794,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.19" sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."split-string-3.1.0" @@ -93808,22 +93825,19 @@ in sources."strict-uri-encode-1.1.0" sources."string-kit-0.11.10" sources."string-padding-1.0.2" - (sources."string-to-stream-1.1.1" // { + sources."string-to-stream-1.1.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + (sources."string_decoder-1.1.1" // { dependencies = [ - sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) - (sources."string-width-4.2.2" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - sources."string_decoder-1.3.0" (sources."stringify-parameters-0.0.4" // { dependencies = [ - sources."commander-2.20.3" sources."magicli-0.0.5" ]; }) @@ -93844,28 +93858,34 @@ in sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."yallist-3.1.1" ]; }) sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) - sources."temp-0.8.4" + (sources."temp-0.8.4" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) sources."terminal-kit-1.49.4" sources."through-2.3.8" (sources."tkwidgets-0.5.26" // { 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."is-fullwidth-code-point-2.0.0" sources."node-emoji-git+https://github.com/laurent22/node-emoji.git" @@ -93896,7 +93916,6 @@ in (sources."uglify-js-3.4.10" // { dependencies = [ sources."commander-2.19.0" - sources."source-map-0.6.1" ]; }) sources."uglifycss-0.0.29" @@ -93915,6 +93934,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isobject-3.0.1" ]; }) sources."upper-case-1.1.3" @@ -93939,18 +93959,23 @@ in sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" - sources."which-1.3.1" - (sources."wide-align-1.1.3" // { + sources."which-2.0.2" + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) - sources."widest-line-3.1.0" sources."word-wrap-1.2.3" sources."wordwrapjs-3.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93958,12 +93983,8 @@ in sources."write-file-atomic-2.4.3" sources."ws-7.5.3" sources."xml-name-validator-3.0.0" - (sources."xml2js-0.4.23" // { - dependencies = [ - sources."xmlbuilder-11.0.1" - ]; - }) - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."xmlchars-2.2.0" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -94052,7 +94073,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -94089,10 +94110,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz"; - sha512 = "Nd+md9wIeyfDK+RGrbOBzwLONSTdihGMtyGYU/t7zYcN2EgUa4iuY3VK2oxtPYrW5ycTj18iC+UbhNTxe4C66g=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.1.tgz"; + sha512 = "vymzfR3OysF5P774x6zYv0bD4EpH6NWRxpq54wO9mA9RuY49yb1teKSICkLx2Ryx+mfzlVVNNbTBtsRtg78t7g=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -94386,7 +94407,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."negotiator-0.6.2" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" @@ -95090,14 +95111,14 @@ in sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."@oclif/core-0.5.29" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -95152,7 +95173,7 @@ in dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-3.0.0" @@ -95361,7 +95382,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -95644,7 +95665,7 @@ in sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" @@ -96508,18 +96529,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.6.0" + sources."@octokit/openapi-types-9.7.0" 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/request-5.6.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" @@ -96778,7 +96799,7 @@ in sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-ci-2.0.0" @@ -96915,7 +96936,7 @@ in sources."resolve-from-4.0.0" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."tar-4.4.16" + sources."tar-4.4.17" sources."which-1.3.1" sources."yallist-3.1.1" ]; @@ -97061,7 +97082,7 @@ in sources."strip-indent-3.0.0" sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."temp-dir-1.0.0" (sources."temp-write-4.0.0" // { dependencies = [ @@ -98078,13 +98099,13 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" @@ -98121,7 +98142,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -98154,7 +98175,7 @@ in sources."@babel/preset-env-7.15.0" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -98178,7 +98199,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -98351,7 +98372,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -98475,7 +98496,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99751,7 +99772,7 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -99763,7 +99784,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" @@ -99776,7 +99797,7 @@ in sources."@babel/plugin-transform-typescript-7.15.0" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-typescript-7.15.0" - sources."@babel/register-7.14.5" + sources."@babel/register-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -99787,14 +99808,14 @@ in sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."@oclif/core-0.5.29" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -99813,10 +99834,10 @@ in }) sources."@oclif/plugin-help-3.3.0" sources."@oclif/screen-1.0.4" - sources."@percy/config-1.0.0-beta.63" - sources."@percy/logger-1.0.0-beta.63" + sources."@percy/config-1.0.0-beta.65" + sources."@percy/logger-1.0.0-beta.65" sources."@percy/migrate-0.10.0" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -99834,7 +99855,7 @@ in sources."assign-symbols-1.0.0" (sources."ast-types-0.14.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."at-least-node-1.0.0" @@ -99858,7 +99879,7 @@ in sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."cardinal-2.1.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -99887,7 +99908,7 @@ in (sources."cli-ux-5.6.3" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-3.0.0" @@ -99963,7 +99984,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.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -100211,7 +100232,7 @@ in (sources."recast-0.20.5" // { dependencies = [ sources."source-map-0.6.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."redeyed-2.1.1" @@ -100390,7 +100411,7 @@ in sources."@fluentui/style-utilities-8.2.2" sources."@fluentui/theme-2.2.1" sources."@fluentui/utilities-8.2.2" - sources."@microsoft/load-themed-styles-1.10.197" + sources."@microsoft/load-themed-styles-1.10.202" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" @@ -100655,7 +100676,7 @@ in sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."ts-log-2.2.3" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -101010,10 +101031,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.1.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.1.0.tgz"; - sha512 = "1jNmgR6DA3aoMLVhEfuagYBzxHVqK7x6pLRY+4c5Atn3PJ/hX1SU56rBED6BRTNiPfGTuudPNXHjWj75MUpj/w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.0.tgz"; + sha512 = "x68Mpn5UkknbHa5Rl4BChZkg47wlAQpwDAkoeFLlnyr7Xjn5zPE0dEu5eGQtcGgBHIgaJJNZhYNOD/H+EWfk3A=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101055,17 +101076,18 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { 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."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -101099,7 +101121,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -101134,7 +101156,7 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -101147,46 +101169,14 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.10.0" // { + (sources."@netlify/build-18.2.8" // { dependencies = [ - (sources."@netlify/zip-it-and-ship-it-4.17.0" // { - dependencies = [ - sources."execa-5.1.1" - sources."locate-path-6.0.0" - sources."p-locate-5.0.0" - sources."pkg-dir-5.0.0" - sources."semver-7.3.5" - sources."yargs-16.2.0" - ]; - }) - sources."ansi-styles-4.3.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."cp-file-9.1.0" - (sources."execa-3.4.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" - sources."semver-6.3.0" - sources."type-fest-0.8.1" - (sources."update-notifier-4.1.3" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) ]; }) - (sources."@netlify/cache-utils-2.0.0" // { + (sources."@netlify/cache-utils-2.0.1" // { dependencies = [ sources."del-5.1.0" sources."locate-path-5.0.0" @@ -101194,65 +101184,62 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-14.4.3" // { + (sources."@netlify/config-15.3.1" // { dependencies = [ sources."dot-prop-5.3.0" - sources."execa-3.4.0" - sources."find-up-4.1.0" sources."is-plain-obj-2.1.0" - sources."locate-path-5.0.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/functions-utils-2.0.2" - (sources."@netlify/git-utils-2.0.0" // { + (sources."@netlify/git-utils-2.0.1" // { dependencies = [ sources."braces-3.0.2" - sources."execa-3.4.0" sources."fill-range-7.0.1" sources."is-number-7.0.0" sources."micromatch-4.0.4" sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/local-functions-proxy-1.1.0" - sources."@netlify/local-functions-proxy-darwin-arm64-1.1.0" - sources."@netlify/local-functions-proxy-darwin-x64-1.1.0" - sources."@netlify/local-functions-proxy-freebsd-arm64-1.1.0" - sources."@netlify/local-functions-proxy-freebsd-x64-1.1.0" - sources."@netlify/local-functions-proxy-linux-arm-1.1.0" - sources."@netlify/local-functions-proxy-linux-arm64-1.1.0" - sources."@netlify/local-functions-proxy-linux-ia32-1.1.0" - sources."@netlify/local-functions-proxy-linux-ppc64-1.1.0" - sources."@netlify/local-functions-proxy-linux-x64-1.1.0" - sources."@netlify/local-functions-proxy-openbsd-x64-1.1.0" - sources."@netlify/local-functions-proxy-win32-ia32-1.1.0" - sources."@netlify/local-functions-proxy-win32-x64-1.1.0" + sources."@netlify/local-functions-proxy-1.1.1" + sources."@netlify/local-functions-proxy-darwin-arm64-1.1.1" + sources."@netlify/local-functions-proxy-darwin-x64-1.1.1" + sources."@netlify/local-functions-proxy-freebsd-arm64-1.1.1" + sources."@netlify/local-functions-proxy-freebsd-x64-1.1.1" + sources."@netlify/local-functions-proxy-linux-arm-1.1.1" + sources."@netlify/local-functions-proxy-linux-arm64-1.1.1" + sources."@netlify/local-functions-proxy-linux-ia32-1.1.1" + sources."@netlify/local-functions-proxy-linux-ppc64-1.1.1" + sources."@netlify/local-functions-proxy-linux-x64-1.1.1" + sources."@netlify/local-functions-proxy-openbsd-x64-1.1.1" + sources."@netlify/local-functions-proxy-win32-ia32-1.1.1" + sources."@netlify/local-functions-proxy-win32-x64-1.1.1" sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.9" - sources."typescript-4.3.5" ]; }) sources."@netlify/plugins-list-3.3.0" sources."@netlify/routing-local-proxy-0.31.0" - (sources."@netlify/run-utils-2.0.0" // { - dependencies = [ - sources."execa-3.4.0" - ]; - }) - (sources."@netlify/zip-it-and-ship-it-4.16.0" // { + sources."@netlify/run-utils-2.0.1" + (sources."@netlify/zip-it-and-ship-it-4.17.0" // { dependencies = [ + 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" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -101300,17 +101287,16 @@ in sources."micromatch-4.0.4" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."@oclif/core-0.5.29" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" + sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."braces-3.0.2" - sources."clean-stack-3.0.1" sources."dir-glob-3.0.1" - sources."escape-string-regexp-4.0.0" sources."fast-glob-3.2.7" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" @@ -101322,14 +101308,15 @@ in sources."micromatch-4.0.4" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."universalify-2.0.0" + sources."wrap-ansi-7.0.0" ]; }) (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."clean-stack-3.0.1" - sources."escape-string-regexp-4.0.0" + sources."ansi-styles-4.3.0" + sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -101339,6 +101326,7 @@ in 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" ]; }) @@ -101348,9 +101336,11 @@ in sources."ansi-escapes-3.2.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."clean-stack-2.2.0" sources."cli-ux-4.9.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" sources."fs-extra-7.0.1" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" @@ -101363,7 +101353,8 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.3.0" + sources."npm-run-path-4.0.1" + sources."tslib-2.3.1" sources."universalify-2.0.0" ]; }) @@ -101376,17 +101367,17 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.6.0" + 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/request-5.6.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" // { @@ -101400,11 +101391,7 @@ in sources."@rollup/pluginutils-3.1.0" sources."@samverschueren/stream-to-observable-0.3.1" sources."@sindresorhus/is-0.14.0" - (sources."@sindresorhus/slugify-1.1.2" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) + sources."@sindresorhus/slugify-1.1.2" (sources."@sindresorhus/transliterate-0.1.2" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -101424,7 +101411,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -101455,7 +101442,11 @@ in sources."accepts-1.3.7" sources."acorn-8.4.1" sources."agent-base-6.0.2" - sources."aggregate-error-3.1.0" + (sources."aggregate-error-3.1.0" // { + dependencies = [ + sources."clean-stack-2.2.0" + ]; + }) sources."ajv-8.6.2" (sources."all-node-versions-8.0.0" // { dependencies = [ @@ -101464,9 +101455,12 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" 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."supports-color-7.2.0" ]; }) (sources."ansi-align-3.0.0" // { @@ -101541,8 +101535,10 @@ 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" ]; }) sources."brace-expansion-1.1.11" @@ -101572,6 +101568,7 @@ in }) (sources."cacheable-request-6.1.0" // { dependencies = [ + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -101580,11 +101577,13 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001249" + 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" @@ -101616,7 +101615,7 @@ in ]; }) sources."clean-deep-3.4.0" - sources."clean-stack-2.2.0" + sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-progress-3.9.0" @@ -101633,22 +101632,19 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."clean-stack-3.0.1" - sources."escape-string-regexp-4.0.0" 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" ]; }) - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."cli-width-2.2.1" - sources."cliui-7.0.4" + sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -101715,7 +101711,12 @@ in }) sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."path-key-2.0.1" + sources."semver-5.7.1" + ]; + }) sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-fns-1.30.1" @@ -101743,7 +101744,6 @@ in dependencies = [ sources."bl-1.2.3" sources."file-type-5.2.0" - sources."is-stream-1.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."tar-stream-1.6.2" @@ -101752,13 +101752,11 @@ in (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-targz-4.1.1" // { dependencies = [ sources."file-type-5.2.0" - sources."is-stream-1.1.0" ]; }) (sources."decompress-unzip-4.0.1" // { @@ -101804,7 +101802,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-7.0.0" + (sources."detective-typescript-7.0.0" // { + dependencies = [ + sources."typescript-3.9.10" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -101842,7 +101844,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -101856,7 +101858,7 @@ in sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" (sources."escodegen-2.0.0" // { dependencies = [ sources."source-map-0.6.1" @@ -101871,8 +101873,12 @@ in sources."eventemitter3-4.0.7" (sources."execa-5.1.1" // { dependencies = [ - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" + sources."cross-spawn-7.0.3" + sources."is-stream-2.0.1" + sources."npm-run-path-4.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" ]; }) sources."exit-on-epipe-1.0.1" @@ -101947,7 +101953,9 @@ in sources."cacheable-request-7.0.2" 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 = [ @@ -101962,10 +101970,15 @@ in sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."responselike-2.0.0" + sources."supports-color-7.2.0" sources."type-fest-0.10.0" ]; }) - sources."figures-3.2.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."file-size-0.0.5" sources."file-type-11.1.0" sources."filename-reserved-regex-2.0.0" @@ -102011,7 +102024,7 @@ in sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-port-5.1.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."get-value-2.0.6" sources."gh-release-fetch-2.0.2" sources."git-repo-info-2.1.1" @@ -102024,7 +102037,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 = [ @@ -102079,6 +102096,7 @@ in }) (sources."hasha-5.2.2" // { dependencies = [ + sources."is-stream-2.0.1" sources."type-fest-0.8.1" ]; }) @@ -102086,6 +102104,7 @@ in sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ + sources."is-stream-2.0.1" sources."parse-json-4.0.0" ]; }) @@ -102105,7 +102124,7 @@ in ]; }) sources."https-proxy-agent-5.0.0" - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -102116,7 +102135,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" @@ -102125,6 +102144,7 @@ in 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."figures-2.0.0" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { @@ -102160,11 +102180,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" @@ -102180,7 +102200,7 @@ in sources."is-promise-2.2.2" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" - sources."is-stream-2.0.1" + sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" @@ -102199,10 +102219,16 @@ in 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."jest-worker-26.6.2" + (sources."jest-worker-26.6.2" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -102215,11 +102241,7 @@ in sources."jsonfile-4.0.0" sources."junk-3.1.0" sources."jwt-decode-3.1.2" - (sources."keep-func-props-3.0.1" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) + sources."keep-func-props-3.0.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" @@ -102240,7 +102262,6 @@ in sources."lines-and-columns-1.1.6" (sources."listr-0.14.3" // { dependencies = [ - sources."is-stream-1.1.0" sources."p-map-2.1.0" ]; }) @@ -102250,6 +102271,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" sources."figures-1.7.0" sources."indent-string-3.2.0" sources."log-symbols-1.0.2" @@ -102263,6 +102285,7 @@ in 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."figures-2.0.0" sources."supports-color-5.5.0" ]; @@ -102275,6 +102298,7 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -102297,8 +102321,10 @@ in sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."fast-equals-1.6.3" + sources."has-flag-4.0.0" sources."micro-memoize-2.1.2" sources."moize-5.4.7" + sources."supports-color-7.2.0" ]; }) sources."log-symbols-4.1.0" @@ -102353,7 +102379,7 @@ in sources."mime-1.6.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -102384,7 +102410,7 @@ in ]; }) sources."mute-stream-0.0.7" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" @@ -102394,11 +102420,8 @@ in sources."qs-6.10.1" ]; }) - (sources."netlify-redirect-parser-8.2.0" // { - dependencies = [ - sources."is-plain-obj-2.1.0" - ]; - }) + sources."netlify-headers-parser-2.1.1" + sources."netlify-redirect-parser-11.0.1" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" @@ -102411,9 +102434,11 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" 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."supports-color-7.2.0" ]; }) sources."noop2-2.0.0" @@ -102424,9 +102449,11 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" 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."supports-color-7.2.0" ]; }) (sources."normalize-package-data-2.5.0" // { @@ -102437,7 +102464,11 @@ in sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."npm-normalize-package-bin-1.0.1" - sources."npm-run-path-4.0.1" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -102461,7 +102492,7 @@ in sources."object.pick-1.3.0" (sources."oclif-plugin-completion-0.6.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."omit.js-2.0.2" @@ -102469,7 +102500,11 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."open-7.4.2" (sources."opn-5.5.0" // { dependencies = [ @@ -102493,7 +102528,6 @@ in sources."p-cancelable-1.1.0" (sources."p-event-4.2.0" // { dependencies = [ - sources."p-finally-1.0.0" sources."p-timeout-3.2.0" ]; }) @@ -102507,25 +102541,16 @@ in sources."p-map-2.1.0" ]; }) - sources."p-finally-2.0.1" + sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-4.0.0" sources."p-reduce-2.1.0" - (sources."p-timeout-2.0.1" // { - dependencies = [ - sources."p-finally-1.0.0" - ]; - }) + sources."p-timeout-2.0.1" sources."p-try-2.2.0" (sources."p-wait-for-3.2.0" // { dependencies = [ - sources."p-finally-1.0.0" sources."p-timeout-3.2.0" ]; }) @@ -102549,12 +102574,6 @@ in (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" ]; }) sources."path-dirname-1.0.2" @@ -102595,7 +102614,7 @@ in sources."process-es6-0.11.6" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."ps-list-6.3.0" + sources."ps-list-7.2.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" @@ -102710,8 +102729,8 @@ in ]; }) sources."setprototypeof-1.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { @@ -102798,6 +102817,7 @@ in sources."ansi-regex-0.2.1" sources."ansi-styles-1.1.0" sources."chalk-0.5.1" + sources."escape-string-regexp-1.0.5" sources."has-ansi-0.1.0" sources."strip-ansi-0.3.0" sources."supports-color-0.2.0" @@ -102823,8 +102843,12 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."strip-outer-1.0.1" - (sources."supports-color-7.2.0" // { + (sources."strip-outer-1.0.1" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + (sources."supports-color-8.1.1" // { dependencies = [ sources."has-flag-4.0.0" ]; @@ -102844,10 +102868,10 @@ in sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ + sources."is-stream-2.0.1" sources."type-fest-0.16.0" ]; }) - sources."term-size-2.2.1" (sources."terser-5.7.1" // { dependencies = [ sources."source-map-0.7.3" @@ -102881,7 +102905,11 @@ in sources."toml-3.0.0" sources."tomlify-j0.4-3.0.0" sources."treeify-1.1.0" - sources."trim-repeated-1.0.0" + (sources."trim-repeated-1.0.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."triple-beam-1.3.0" sources."tslib-1.14.1" sources."tsutils-3.21.0" @@ -102890,7 +102918,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.10" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -102918,14 +102946,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" @@ -102944,30 +102965,26 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-3.0.2" + sources."escape-string-regexp-1.0.5" sources."supports-color-5.5.0" ]; }) sources."wcwidth-1.0.1" sources."well-known-symbols-2.0.0" - sources."which-2.0.2" + sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-3.1.0" (sources."windows-release-3.3.3" // { dependencies = [ - sources."cross-spawn-6.0.5" sources."execa-1.0.0" sources."get-stream-4.1.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" ]; }) - sources."winston-3.3.3" + (sources."winston-3.3.3" // { + dependencies = [ + sources."is-stream-2.0.1" + ]; + }) (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -102975,7 +102992,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -102984,20 +103001,15 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.9" + sources."yargs-parser-18.1.3" sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -103126,7 +103138,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."util-deprecate-1.0.2" @@ -103530,7 +103542,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."tar-4.4.16" // { + (sources."tar-4.4.17" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -103559,7 +103571,7 @@ in sha512 = "S3vhm/EqQwEvHDBw/375j4f5vVT9YknfTEeQjbA/Fa2XAK0WLCC+ENLV+4HzkpSAIi+9hmrF3TpdhjVLksmk1A=="; }; dependencies = [ - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@mapbox/node-pre-gyp-1.0.5" sources."@node-red/editor-api-2.0.5" sources."@node-red/editor-client-2.0.5" @@ -103584,7 +103596,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -103920,7 +103932,7 @@ in }) sources."toidentifier-1.0.0" sources."tough-cookie-4.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.13.10" @@ -104113,7 +104125,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -104344,7 +104356,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -104848,10 +104860,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.5"; + version = "7.20.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.5.tgz"; - sha512 = "vRyu1V79n5BzKn4vkanag1xEjEMLIZ48Ry1V7IyAvHQHi8syOEiYWvUMxNpeDk+e8JKAKCNG3lIYJDm3pM8VMQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.6.tgz"; + sha512 = "SRx0i1sMZDf8cd0/JokYD0EPZg0BS1iTylU9MSWw07N6/9CZHjMpZL/p8gsww7m2JsWAsTamhmGl15dQ9UgUgw=="; }; buildInputs = globalBuildInputs; meta = { @@ -105169,7 +105181,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -105509,9 +105521,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -105547,7 +105559,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -105584,7 +105596,7 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -105709,7 +105721,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -105847,7 +105859,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.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105984,7 +105996,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -107791,7 +107803,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."eventemitter2-5.0.1" - sources."fast-json-patch-3.0.0-1" + sources."fast-json-patch-3.1.0" sources."fast-levenshtein-2.0.6" sources."fast-printf-1.6.6" sources."fclone-1.0.11" @@ -107901,7 +107913,7 @@ in sources."systeminformation-5.8.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tv4-1.3.0" sources."tx2-1.0.4" sources."type-check-0.3.2" @@ -107933,10 +107945,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.12.1"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.1.tgz"; - sha512 = "p2fowre11u8/f6rw6n1zadtpNLQd2XNux40sUUdcVQqwryUG0YO7xveP96iRTBSWi+RdyCRlXnDgppyvb31d8g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.13.0.tgz"; + sha512 = "dQE0WtzS8Rs6UEpsKeFxHjLPqMHM94v45IhmHX5A/w3V5tEvx4A2PzKBtOF5brJp7SPLyzAnY4L/w/BpBV6qxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -107986,7 +107998,7 @@ in }; dependencies = [ sources."colorette-1.3.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."source-map-js-0.6.2" ]; buildInputs = globalBuildInputs; @@ -108439,10 +108451,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.3.tgz"; - sha512 = "qAlUEFQRTRKnKet3SxRbLmrC5mOyBIiR5CDqzOmorDN10jgcFIR6mL1sJujQc5cRRcE+HNbBuBeoVdiDvznOGg=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.4.tgz"; + sha512 = "llUv605I8yvraO98rb5RmmqPdpWBno7IpIlgNlX3Nq3Q4lvB7G0OxGK89JuAoVZ8T/xkTzhjyuzw0sty0DoY3Q=="; }; dependencies = [ sources."isexe-2.0.0" @@ -108605,10 +108617,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 = { @@ -108887,7 +108899,7 @@ in sources."inherits-2.0.4" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -108998,9 +109010,9 @@ in sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -109037,7 +109049,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -109083,8 +109095,8 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.8" + sources."@babel/register-7.15.3" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -109093,7 +109105,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -109281,7 +109293,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -109510,7 +109522,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -109803,7 +109815,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -110802,7 +110814,7 @@ in sources."webidl-conversions-5.0.0" ]; }) - sources."dompurify-2.3.0" + sources."dompurify-2.3.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -110853,7 +110865,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; @@ -110869,10 +110881,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.2.tgz"; - sha512 = "GyOCEr1g+U/Js7lgHj+0vH9L2uCwbc0m9CJrlb099qp6jzmxnJQ6sC85BiN9DOwr4/fsQfVhoNpWQSkkpFBo5Q=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.3.tgz"; + sha512 = "qTBaEfwVqCvqLbuloZ9sMBQA49WfMOQrLVBGiVyT7pNMAjosQCpMyFESqQL8WqVxDzV2olPCZ1L2rG9cuDGOsA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -110889,8 +110901,8 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.2" - sources."@babel/runtime-7.14.8" + sources."@babel/parser-7.15.3" + sources."@babel/runtime-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -110983,7 +110995,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.0" + sources."dompurify-2.3.1" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111108,7 +111120,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.55" // { + (sources."redoc-2.0.0-rc.56" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -111178,7 +111190,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; @@ -111588,7 +111600,7 @@ in sources."get-intrinsic-1.1.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."globby-11.0.4" sources."graceful-fs-4.2.8" sources."growl-1.10.5" @@ -111751,7 +111763,7 @@ in sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.3.0" + sources."tslib-2.3.1" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -111760,7 +111772,7 @@ in sources."tunnel-0.0.6" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typed-rest-client-1.8.4" + sources."typed-rest-client-1.8.5" sources."typescript-4.3.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" @@ -112090,10 +112102,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.53.1"; + version = "2.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.53.1.tgz"; - sha512 = "LK7BWPCpMq0p1TcnJb4uCkxYYrbsM2J7FOCd29BYKmvvUrB+NzFeAVGE1sR/cPF6ECT0PWsR9NEADb24o5D2WA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.54.0.tgz"; + sha512 = "z/cVR0jg7QN2YRP9SvcJGM2nZPGI2b+EWxrbJy3PfY1VhBfJsODQjkdwOpsmiYVxX8UYxOrjO507JJRm2Fn3Aw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -112126,7 +112138,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.14.2" // { + (sources."@serverless/components-3.15.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -112185,7 +112197,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -112246,7 +112258,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.965.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -112791,7 +112803,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.42.0" // { + (sources."simple-git-2.44.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -112864,7 +112876,7 @@ in sources."untildify-3.0.3" ]; }) - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."chownr-2.0.0" sources."mkdirp-1.0.4" @@ -113601,14 +113613,15 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.677.0"; + version = "1.682.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.677.0.tgz"; - sha512 = "2CALWUc+gOmOmpK9ehsJiaU0SYJEEmpJYalVw1Gh8pk4S/8bZWx5OdaQyD3ep29ZX5BCVSDQvOE22NPtTs8X7g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.682.0.tgz"; + sha512 = "tJqDDtHZaSONwURXcs0Itui+0PSFN9te31/+OSpGcyJl4DutDHPcoEyek50bwQcny4yy44s80KW1hFpeOozLZQ=="; }; 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" @@ -113669,13 +113682,13 @@ in }) (sources."@snyk/mix-parser-1.3.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.2" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) (sources."@snyk/snyk-docker-pull-3.7.0" // { @@ -113686,7 +113699,7 @@ in }) (sources."@snyk/snyk-hex-plugin-1.1.4" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."@szmarczak/http-timer-4.0.6" @@ -113723,7 +113736,7 @@ in sources."which-2.0.2" ]; }) - sources."@yarnpkg/fslib-2.5.0" + sources."@yarnpkg/fslib-2.5.1" sources."@yarnpkg/json-proxy-2.1.1" sources."@yarnpkg/libzip-2.2.2" sources."@yarnpkg/lockfile-1.1.0" @@ -113740,13 +113753,6 @@ in }) sources."abbrev-1.1.1" sources."aggregate-error-3.1.0" - (sources."ansi-align-3.0.0" // { - dependencies = [ - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - ]; - }) sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -113771,15 +113777,6 @@ in sources."bl-4.1.0" sources."boolean-3.1.2" sources."bottleneck-2.19.5" - (sources."boxen-5.0.1" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."chalk-4.1.2" - sources."strip-ansi-6.0.0" - sources."type-fest-0.20.2" - sources."wrap-ansi-7.0.0" - ]; - }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserify-zlib-0.1.4" @@ -113807,7 +113804,6 @@ in sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinner-0.2.10" sources."cli-spinners-2.6.0" @@ -113837,7 +113833,6 @@ in sources."mimic-response-3.1.0" ]; }) - sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" @@ -113853,7 +113848,6 @@ in sources."dockerfile-ast-0.2.1" sources."dot-prop-5.3.0" sources."dotnet-deps-parser-5.1.0" - sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -113867,12 +113861,11 @@ in sources."end-of-stream-1.4.4" sources."endian-reader-0.3.0" sources."es6-error-4.1.1" - sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" (sources."event-loop-spinner-2.1.0" // { dependencies = [ - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."execa-1.0.0" @@ -113898,7 +113891,6 @@ in sources."semver-7.3.5" ]; }) - sources."global-dirs-3.0.0" sources."globalthis-1.0.2" sources."globby-11.0.4" sources."got-11.8.2" @@ -113908,7 +113900,6 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" - sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -113916,24 +113907,19 @@ in sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."immediate-3.0.6" - sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-2.0.0" sources."is-3.3.0" sources."is-callable-1.2.4" - sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-gzip-1.0.0" - sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" - sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" @@ -113942,7 +113928,6 @@ in sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-yaml-3.14.1" @@ -113958,7 +113943,6 @@ in ]; }) sources."keyv-4.0.3" - sources."latest-version-5.1.0" sources."lie-3.3.0" sources."lodash-4.17.21" sources."lodash.assign-4.2.0" @@ -114062,27 +114046,6 @@ in sources."p-limit-2.3.0" sources."p-map-4.0.0" sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."lowercase-keys-2.0.0" - ]; - }) - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."get-stream-5.2.0" - sources."got-9.6.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."lowercase-keys-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."responselike-1.0.2" - ]; - }) sources."pako-0.2.9" sources."parse-link-header-1.0.1" sources."path-is-absolute-1.0.1" @@ -114092,7 +114055,6 @@ in sources."pegjs-0.10.0" sources."picomatch-2.3.0" sources."pluralize-7.0.0" - sources."prepend-http-2.0.0" sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -114109,18 +114071,10 @@ in sources."pump-2.0.1" ]; }) - sources."pupa-2.1.1" sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."readable-stream-3.6.0" - sources."registry-auth-token-4.2.1" - sources."registry-url-5.1.0" sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -114135,7 +114089,6 @@ in sources."sax-1.2.4" sources."semver-6.3.0" sources."semver-compare-1.0.0" - sources."semver-diff-3.1.1" (sources."serialize-error-7.0.1" // { dependencies = [ sources."type-fest-0.13.1" @@ -114150,16 +114103,16 @@ in (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ sources."chalk-4.1.2" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) - (sources."snyk-docker-plugin-4.22.1" // { + (sources."snyk-docker-plugin-4.23.0" // { dependencies = [ sources."argparse-2.0.1" sources."js-yaml-4.1.0" sources."rimraf-3.0.2" sources."semver-7.3.5" - sources."snyk-nodejs-lockfile-parser-1.35.1" + sources."snyk-nodejs-lockfile-parser-1.36.0" sources."tmp-0.2.1" ]; }) @@ -114175,7 +114128,7 @@ in sources."chalk-3.0.0" sources."rimraf-3.0.2" sources."tmp-0.2.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" ]; }) sources."snyk-module-3.1.0" @@ -114192,7 +114145,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" @@ -114207,16 +114160,16 @@ 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.0" + sources."tslib-2.3.1" ]; }) (sources."snyk-policy-1.22.0" // { 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" ]; }) @@ -114275,9 +114228,8 @@ in ]; }) sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { @@ -114296,7 +114248,6 @@ in ]; }) sources."tmp-0.0.33" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toml-3.0.0" sources."tree-kill-1.2.2" @@ -114308,20 +114259,12 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."upath-2.0.1" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."semver-7.3.5" - ]; - }) - sources."url-parse-lax-3.0.0" sources."utf8-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."vscode-languageserver-types-3.16.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - sources."widest-line-3.1.0" sources."windows-release-3.3.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ @@ -114366,7 +114309,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -114855,7 +114798,7 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.1.1" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" @@ -114906,7 +114849,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.6" // { + (sources."jitdb-3.1.7" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -115568,7 +115511,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.965.0" // { + (sources."aws-sdk-2.968.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -116368,13 +116311,13 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.8" + sources."@babel/helpers-7.15.3" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.2" + sources."@babel/parser-7.15.3" sources."@babel/template-7.14.5" sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" @@ -116407,7 +116350,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -116445,7 +116388,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -116687,7 +116630,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -116732,7 +116675,7 @@ in sources."svelte-preprocess-4.7.4" sources."svelte2tsx-0.4.5" sources."to-regex-range-5.0.1" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."typescript-4.3.5" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" @@ -116769,7 +116712,7 @@ in sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; }; dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -116831,18 +116774,15 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz"; - sha512 = "riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.4.0.tgz"; + sha512 = "W25S1UUm9Lm9VnE0TvCzL7aso/NCzDEaXLaElCUO/KaVitw0+IBicSVfM1L1c0YHK5TOFh73yQ2naCpVHEQ/OQ=="; }; dependencies = [ sources."@trysound/sax-0.1.1" - sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."colorette-1.3.0" sources."commander-7.2.0" sources."css-select-4.1.3" sources."css-tree-1.1.3" @@ -116853,12 +116793,10 @@ in sources."domhandler-4.2.0" sources."domutils-2.7.0" sources."entities-2.2.0" - sources."has-flag-4.0.0" sources."mdn-data-2.0.14" sources."nth-check-2.0.0" sources."source-map-0.6.1" sources."stable-0.1.8" - sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -118736,7 +118674,7 @@ in sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" @@ -118845,7 +118783,7 @@ in sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.3" + sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-capitalized-1.0.0" @@ -118925,7 +118863,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -119312,7 +119250,7 @@ in sources."strip-outer-1.0.1" sources."strtok3-6.2.4" sources."supports-color-7.2.0" - sources."tar-4.4.16" + sources."tar-4.4.17" sources."tlds-1.208.0" sources."to-array-0.1.4" sources."to-readable-stream-1.0.0" @@ -119809,10 +119747,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.5.4"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.4.tgz"; - sha512 = "MQbCaq+ZUGfibp91reQJGYPXWbEdsY8G+iAkOaKRLOs3MDIssacEYF3v1nFne8iWWYPSsYs4HvuiIzbuUAO8GA=="; + 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" @@ -119871,17 +119809,16 @@ in sources."unique-string-2.0.0" sources."universalify-2.0.0" sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-5.3.0-next.10" + sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" - sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Language Server Protocol (LSP) implementation for TypeScript using tsserver"; - homepage = "https://github.com/theia-ide/typescript-language-server#readme"; license = "Apache-2.0"; }; production = true; @@ -120221,7 +120158,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -120339,7 +120276,7 @@ in ]; }) sources."vfile-location-2.0.6" - (sources."vfile-message-3.0.1" // { + (sources."vfile-message-3.0.2" // { dependencies = [ sources."unist-util-stringify-position-3.0.0" ]; @@ -120476,7 +120413,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.1.7" + sources."tar-6.1.8" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" sources."vega-5.20.2" @@ -120599,7 +120536,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -120830,7 +120767,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globals-13.10.0" + sources."globals-13.11.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -121165,7 +121102,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" @@ -121190,7 +121127,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -121230,7 +121167,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -121415,9 +121352,9 @@ in sources."tapable-1.1.3" ]; }) - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tunnel-0.0.6" - sources."typed-rest-client-1.8.4" + sources."typed-rest-client-1.8.5" sources."typescript-4.3.5" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -121440,7 +121377,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" ]; @@ -121796,7 +121733,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -122634,7 +122571,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.0.1" + sources."vfile-message-3.0.2" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -122719,7 +122656,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.9" + sources."@babel/runtime-corejs3-7.15.3" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -122748,7 +122685,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" @@ -122878,7 +122815,7 @@ in sources."svg-pathdata-5.0.5" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" - sources."tar-6.1.7" + sources."tar-6.1.8" (sources."tough-cookie-4.0.0" // { dependencies = [ sources."universalify-0.1.2" @@ -122935,10 +122872,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" @@ -122961,23 +122898,32 @@ 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" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" 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" @@ -123029,7 +122975,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" @@ -123053,7 +122999,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" @@ -123076,6 +123022,7 @@ in (sources."dispensary-0.62.0" // { dependencies = [ sources."async-3.2.1" + sources."pino-6.11.3" ]; }) sources."doctrine-3.0.0" @@ -123094,14 +123041,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" ]; @@ -123113,10 +123066,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" @@ -123183,7 +123136,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - sources."globals-13.10.0" + sources."globals-13.11.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -123311,7 +123264,7 @@ in }) sources."mz-2.7.0" sources."nan-2.15.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -123351,9 +123304,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" @@ -123414,7 +123367,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" @@ -123461,7 +123414,7 @@ in sources."to-readable-stream-1.0.0" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" - sources."tslib-2.3.0" + sources."tslib-2.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" @@ -123532,7 +123485,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -123556,11 +123509,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.7" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001249" + sources."caniuse-lite-1.0.30001251" sources."chrome-trace-event-1.0.3" sources."colorette-1.3.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.801" + sources."electron-to-chromium-1.3.806" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -123620,16 +123573,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" @@ -123697,7 +123650,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -124352,7 +124305,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -124643,7 +124596,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" @@ -124660,7 +124613,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; @@ -124789,11 +124742,11 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.8" + sources."@babel/runtime-7.15.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.8.0" // { + (sources."@npmcli/arborist-2.8.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -124807,7 +124760,7 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/map-workspaces-1.0.3" + sources."@npmcli/map-workspaces-1.0.4" (sources."@npmcli/metavuln-calculator-1.1.1" // { dependencies = [ sources."semver-7.3.5" @@ -125533,7 +125486,7 @@ in ]; }) sources."taketalk-1.0.0" - (sources."tar-6.1.7" // { + (sources."tar-6.1.8" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -125708,10 +125661,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" @@ -125719,7 +125672,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.13" + sources."@types/node-16.6.1" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" From 81769efdee8863924dff924c4225b2acb0a6d910 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Mon, 16 Aug 2021 16:57:11 +0300 Subject: [PATCH 175/239] mopidy-iris: 3.54.0 -> 3.58.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From e4c527476e8ae64dc2796effebf28d46d7c9fc69 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Mon, 16 Aug 2021 17:07:24 +0300 Subject: [PATCH 176/239] mopidy-spotify: 4.0.1 -> 4.1.1 --- pkgs/applications/audio/mopidy/spotify.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 3a9a6863a7d4e213ca36ce0c2b494564d05a9e3b Mon Sep 17 00:00:00 2001 From: j-hui Date: Mon, 16 Aug 2021 10:33:12 -0400 Subject: [PATCH 177/239] saleae-logic-2: init at 2.3.33 --- .../tools/misc/saleae-logic-2/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/misc/saleae-logic-2/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c22f05c298e..0af91c0dbbb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14353,6 +14353,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 { }; From 655127e717262dae6252ab6cc7f10ae321a555e7 Mon Sep 17 00:00:00 2001 From: j-hui Date: Mon, 16 Aug 2021 10:36:05 -0400 Subject: [PATCH 178/239] maintainers: add j-hui --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e1efa65be99..f8ddc824f884 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"; From 40b2d9c84d6505899de0d1ab84a160ddb95c6313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Aug 2021 16:42:51 +0200 Subject: [PATCH 179/239] python3.pkgs.typer: mark as broken --- pkgs/development/python-modules/typer/default.nix | 3 +++ 1 file changed, 3 insertions(+) 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 ]; }; } From b68618fc5612c12b8f8a8c39ed51edf825b9e2b6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 16 Aug 2021 08:15:43 -0700 Subject: [PATCH 180/239] python3Packages.pybids: mark broken see https://github.com/bids-standard/pybids/issues/680 --- pkgs/development/python-modules/pybids/default.nix | 3 +++ 1 file changed, 3 insertions(+) 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; }; } From a64e6a253b485bc61d00ba525419a826541568f4 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 18:06:22 +0300 Subject: [PATCH 181/239] python38Packages.bids-validator: 1.7.2 -> 1.8.0 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 58a02daa36fab8e12f00887df2bd480215e7a01c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 08:54:25 +0000 Subject: [PATCH 182/239] python38Packages.gipc: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/gipc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 71867a77d995c7826cf406c88bd9efd05e795867 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 07:19:26 +0000 Subject: [PATCH 183/239] python38Packages.doc8: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/doc8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 6e01aa7ca639260aa4c8e652656f132fd5bfeb19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 08:32:46 +0000 Subject: [PATCH 184/239] python38Packages.flowlogs_reader: 2.4.0 -> 3.1.0 --- pkgs/development/python-modules/flowlogs_reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 97ae49d708fce32a838e9b4359a319596dc29cd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 19:04:42 +0200 Subject: [PATCH 185/239] python3Packages.growattserver: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From ac7a14a9f037ef8c0a289cb81cd2edb4b74a3802 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 19:17:51 +0200 Subject: [PATCH 186/239] python3Packages.aiotractive: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/aiotractive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = [ From 575f35cf8ce786a9e642921120ced540b775196b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 16 Aug 2021 10:21:40 -0700 Subject: [PATCH 187/239] linux_xanmod: 5.13.10 -> 5.13.11 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; { From 5dc38fe346f0900c98b800ea4d2aaede0b140a0a Mon Sep 17 00:00:00 2001 From: tekeri <47343275+tekeri@users.noreply.github.com> Date: Sun, 15 Aug 2021 15:43:29 +0900 Subject: [PATCH 188/239] firefox-bin: custom policy setup via config.firefox.policies --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From a37965f7c5d26938774677e97b9f6c9e35bce701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 16 Aug 2021 19:32:04 +0200 Subject: [PATCH 189/239] nixos: fix release notes about linux_latest version It's version 5.13, not 5.12. --- nixos/doc/manual/from_md/release-notes/rl-2105.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2105.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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} From 874a5aa449c7664b3fda113421f6a06fdc9cece9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 13:49:02 -0400 Subject: [PATCH 190/239] rnix-lsp: remove unused argument --- pkgs/development/tools/rnix-lsp/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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"; }; From a5341beb789c66ed24a11396dda28f2a1303768e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 16 Aug 2021 11:31:42 +0200 Subject: [PATCH 191/239] linux: drop `*_latest_hardened`-attributes in favor of versioned attributes The problem behind this is that the hardened patchset[1]. Quite recently this led to a weird problem when Linux 5.12 was dropped (and thus had to be removed from `nixpkgs`), there were no patches for 5.13, so `linuxPackages_hardened_latest` had to be downgraded to 5.10 as base[2] which may be rather unintuitive and unexpected. To avoid these kind of "silent downgrades" in the future, it makes sense to drop the attribute entirely. If somebody wants to use a hardened kernel, it's better to explicitly pin it using the newly introduced versioned attributes, e.g. `linuxPackages_4_14_hardened`. [1] https://github.com/anthraxx/linux-hardened/ [2] https://github.com/NixOS/nixpkgs/pull/133587 --- .../from_md/release-notes/rl-2111.section.xml | 10 ++++++++++ .../manual/release-notes/rl-2111.section.md | 5 +++++ nixos/tests/kernel-generic.nix | 5 +++++ pkgs/top-level/aliases.nix | 14 +++++++++++++ pkgs/top-level/all-packages.nix | 20 ++++++++++++------- 5 files changed, 47 insertions(+), 7 deletions(-) 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 f88be3918795..20c64f2a6710 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 @@ -717,6 +717,16 @@ 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/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index b7cb31883f67..87747e0fc1ba 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -183,6 +183,11 @@ To be able to access the web UI this port needs to be opened in the firewall. - 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 setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 62d80db2915b..5993d0e6ab78 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -33,5 +33,10 @@ with pkgs; { linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; + linux_hardened_4_14 = makeKernelTest "4.14" linuxPackages_4_14_hardened; + linux_hardened_4_19 = makeKernelTest "4.19" linuxPackages_4_19_hardened; + linux_hardened_5_4 = makeKernelTest "5.4" linuxPackages_5_4_hardened; + linux_hardened_5_10 = makeKernelTest "5.10" linuxPackages_5_10_hardened; + linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7387d7188384..eaeff814e13b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -448,6 +448,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 e81649f864fb..8d6d2b4248ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21553,11 +21553,8 @@ with pkgs; linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); # Hardened Linux - hardenedLinuxPackagesFor = kernel': overrides: - let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_10; - kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; - in linuxPackagesFor (kernel.override { + hardenedLinuxPackagesFor = kernel: overrides: + linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit lib; inherit (kernel) version; @@ -21572,8 +21569,17 @@ with pkgs; linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); - linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_4_14_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_14 { }); + linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + + linuxPackages_4_19_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_19 { }); + linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + + linuxPackages_5_4_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_4 { }); + linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + + linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); + linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); From 099113751e66899a620bb3e23875d421fc40804f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 16 Aug 2021 11:44:02 +0200 Subject: [PATCH 192/239] linuxPackages_4_14_hardened: fix eval Not sure if this is the right thing to do, but apparently we want this setting for <4.18, so we hard-code it for 4.14 via `mkForce` (previously this has led to conflicting definitions which is why the hardened 4.14 kernel never seems to have evaluated properly). --- pkgs/os-specific/linux/kernel/hardened/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b3b61f78a08d2e9654889af971e39f1777c9ca83 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 16 Aug 2021 20:54:29 +0200 Subject: [PATCH 193/239] freetype: format (#133165) --- .../libraries/freetype/default.nix | 82 +++++++++---------- 1 file changed, 39 insertions(+), 43 deletions(-) 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" - ''; - } From 6275972e4ff184ead9dae76a94cb9ac37b8c89e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 21:20:41 +0200 Subject: [PATCH 194/239] python3Packages.pymeteireann: 0.3 -> 2021.8.0 --- pkgs/development/python-modules/pymeteireann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 4c7280d387b373f3164e96509021522d7f31f6da Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:21:29 -0400 Subject: [PATCH 195/239] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 114 ++++++++++++++-------------- pkgs/misc/vim-plugins/overrides.nix | 2 +- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9b80c6ce608a..bba3483894ff 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/"; }; @@ -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/"; }; @@ -593,12 +593,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 +1919,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 +2532,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 +2676,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 = "d6edfefa60b067246e8007cbaa213f3a4f59d8ef"; - sha256 = "0bw20bzh9z3r8fd4dd9ffrllk931g0nj26n91rrqq1pmx983i4ym"; + rev = "d1084c0ac413d6ad1ed3ec290604e7e2fbe0aae1"; + sha256 = "1qjs3wj4svjvbangivpvg7j4swm50d7s0ll1qsg61s59jchp1gjq"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3252,12 +3252,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/"; }; @@ -3528,12 +3528,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/"; }; @@ -3564,12 +3564,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 = "f5dc246c2edfd237ebcb0288250a18771019e810"; - sha256 = "1mm89m7lfcrw2hxqbpnvxv610wl5lvinslb8m26j2xrpv0k2qnzb"; + rev = "4db2c4e2b59d16143bd8903c9bc73776b535be50"; + sha256 = "18dg3gdfwxhhz8snvw697r4nmc9aag3ylrzm7g84k67hpfir82r6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3732,12 +3732,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/"; }; @@ -3840,12 +3840,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b4661ec91e4675a339289d5662a93e646aeabe6f"; - sha256 = "1ax327j9p2bjrwni24s9ymp1zjhq5b1h5znxb4myjmh29q5x0pgm"; + rev = "acb420880b83563c0ce83a3cea278cadfc7023e4"; + sha256 = "16bfn1qkbnicpkpisf5i4snra8glfg4rawvi52fpjqghxj9g1xz2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4537,12 +4537,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring-nvim"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "48eeaf96bd78087dbf1df220fa6bf3e81906a481"; - sha256 = "1h6vgw25fi7ar9gk8b1a5v61lc26myf7rr82hg2vfdrif4w9qgzq"; + rev = "aabd4776d3fd756b76f9e264496e1ea81cab77c4"; + sha256 = "168hpn3nxjsy3a5h3lvzk6gbhcfnh7k7p0xhpjxi67x1f99dnx0s"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -4995,12 +4995,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/"; }; @@ -6210,12 +6210,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/"; }; @@ -8277,12 +8277,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/"; }; @@ -9538,12 +9538,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/"; }; @@ -9947,12 +9947,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "6302a3db7e1fbf691feac65f3f1b2f031653c81f"; - sha256 = "03xag1nqv6l26hw53pb707g6amqaq7kpa72wa7nmps41nxbgswdn"; + rev = "cb71390373e793875efd3609e0ad800d816ff4af"; + sha256 = "0l9yklk0pd7kgy39b09rirwpqbryy148ch9vffq3isyhdk6b3v10"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10067,12 +10067,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-15"; + version = "2021-08-16"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "4d272abddc0d86e0b25ead5620ed150b96139b06"; - sha256 = "074yipfzy5ca4hlds3gpls31ms5js2zbx458km3svii8zs80kszr"; + 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 aa6b762fd850..5b6b9a2264d9 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -671,7 +671,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-wYxUo9zfflU7RTsTb7W9wc/WBsXhz3OLjC8CwUkRRiE="; + cargoSha256 = "16lcsi5mxmj79ky5lbpivravn8rjl4z3j3fsxrglb22ab4i7js3n"; }; in '' From 47514e07470fd79bb8a34db8e6047dc3cd600dbb Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:21:59 -0400 Subject: [PATCH 196/239] vimPlugins.nvim-cmp: init at 2021-08-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index bba3483894ff..42dc992a0297 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3682,6 +3682,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"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c98cd6653ce5..c52d9c7e14d2 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -213,6 +213,7 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff +hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ From 62cab46c8c0b07a4c0bf914480888380b3d65c6f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:22:29 -0400 Subject: [PATCH 197/239] vimPlugins.cmp-buffer: init at 2021-08-11 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 42dc992a0297..80979288c58c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -519,6 +519,18 @@ 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/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c52d9c7e14d2..6e82241eeb7a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -213,6 +213,7 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff +hrsh7th/cmp-buffer@main hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip From bd3687c3de4a4ed62dd904378e4c6e18eb1ecece Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:22:57 -0400 Subject: [PATCH 198/239] vimPlugins.cmp-calc: init at 2021-08-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 80979288c58c..d0181a67f25a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -531,6 +531,18 @@ final: prev: 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/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6e82241eeb7a..7c372a8af876 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -214,6 +214,7 @@ honza/vim-snippets hoob3rt/lualine.nvim hotwatermorning/auto-git-diff hrsh7th/cmp-buffer@main +hrsh7th/cmp-calc@main hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip From 7a8c06b08dcbbe5916445d91dccf8e2bd36fa126 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:23:27 -0400 Subject: [PATCH 199/239] vimPlugins.cmp-emoji: init at 2021-08-09 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d0181a67f25a..412fd959f72c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -543,6 +543,18 @@ final: prev: 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/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7c372a8af876..8f27111ffe5f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -215,6 +215,7 @@ hoob3rt/lualine.nvim hotwatermorning/auto-git-diff hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main +hrsh7th/cmp-emoji@main hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip From 5670287c5b0029cb3f272a38bf16ad94e42cf46c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:23:57 -0400 Subject: [PATCH 200/239] vimPlugins.cmp-nvim-lsp: init at 2021-08-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 412fd959f72c..15f343c417e0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -555,6 +555,18 @@ final: prev: 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/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8f27111ffe5f..1fe9faebe070 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -216,6 +216,7 @@ hotwatermorning/auto-git-diff hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main hrsh7th/cmp-emoji@main +hrsh7th/cmp-nvim-lsp@main hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip From 1455ef4f4d983c21af2502702863140667599e20 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:24:27 -0400 Subject: [PATCH 201/239] vimPlugins.cmp-path: init at 2021-08-09 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 15f343c417e0..31df18a4aab7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -567,6 +567,18 @@ final: prev: 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/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1fe9faebe070..2c021ef627b6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -217,6 +217,7 @@ hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main hrsh7th/cmp-emoji@main hrsh7th/cmp-nvim-lsp@main +hrsh7th/cmp-path@main hrsh7th/nvim-cmp@main hrsh7th/nvim-compe hrsh7th/vim-vsnip From c3f09b3daf6d30d3baea0197cce4a5b7ed131093 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:24:57 -0400 Subject: [PATCH 202/239] vimPlugins.cmp-vsnip: init at 2021-08-13 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 31df18a4aab7..ad314c20e917 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -579,6 +579,18 @@ final: prev: 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/"; + }; + coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; version = "2021-05-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2c021ef627b6..f6dc205eb3d3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -218,6 +218,7 @@ 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 From 42dad213cb77f19a188e7d1b849e0443a12b498c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 16 Aug 2021 14:25:27 -0400 Subject: [PATCH 203/239] vimPlugins.cmp_luasnip: init at 2021-08-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ad314c20e917..24b60ea1d9e3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -591,6 +591,18 @@ final: prev: 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"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f6dc205eb3d3..39973d77e098 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -614,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 From 75a35986bf0765852789d8869ecb26f2ad3ff70c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 4 Aug 2021 11:43:51 +0300 Subject: [PATCH 204/239] =?UTF-8?q?sfm:=200.2=20=E2=86=92=200.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/sfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From 8ad1a7859a426331672ff7f85f1832c17a3ecc85 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 21:54:22 +0200 Subject: [PATCH 205/239] tlaps: deprecate phases --- .../science/logic/tlaplus/tlaps.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) 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 = [ ]; }; From 8a8a949ffdffa91b6de49310263e6406f101ca32 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 21:54:44 +0200 Subject: [PATCH 206/239] tlaplusToolbox: deprecate phases --- .../science/logic/tlaplus/toolbox.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 From b58fedc98ea9eb6586d985e0975bd19d6db70fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 16 Aug 2021 22:01:52 +0200 Subject: [PATCH 207/239] croc: 9.2.1 -> 9.3.0 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From 024414f501fdbed1489050fd11092889a4305da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Mon, 16 Aug 2021 22:12:57 +0200 Subject: [PATCH 208/239] lisp-modules: use lib.makeSearchPath in shell.nix --- pkgs/development/lisp-modules/shell.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) 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 From 0fe56e14b6658d2e5c8629d34da1c653dabdba3f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 16 Aug 2021 13:36:37 -0700 Subject: [PATCH 209/239] hqplayerd: 4.25.0-64 -> 4.25.1-65 --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 2c090abeb03b77fa89aba77574444fa9541c1f0d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 16 Aug 2021 13:39:16 -0700 Subject: [PATCH 210/239] hqplayer-desktop: 4.12.2-36 -> 4.13.1-38 --- pkgs/applications/audio/hqplayer-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 9c3de9dd586506a7694fc9f19d459ad381239e34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Aug 2021 23:59:26 +0200 Subject: [PATCH 211/239] python3Packages.pre-commit: 2.13.0 -> 2.14.0 --- pkgs/development/python-modules/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 84f5f4f84cfc186e205a87a58593309b3535f024 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Aug 2021 00:02:06 +0200 Subject: [PATCH 212/239] python3Packages.simplisafe-python: 11.0.3 -> 11.0.4 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From c977af0b0228a92c817d4e1f0a2122c608b0580a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 16 Aug 2021 18:05:40 -0400 Subject: [PATCH 213/239] cmark: fix tests on darwin Use DYLD_FALLBACK_LIBRARY_PATH to find the library. --- pkgs/development/libraries/cmark/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 1cc19277522d..93bc973d4127 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -19,10 +19,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; { From 1ccced5932f904a71965b50f052d487643e22875 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Aug 2021 00:08:47 +0200 Subject: [PATCH 214/239] python3Packages.zeroconf: 0.35.1 -> 0.36.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 84567049c10a..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.1"; + 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-zEi5wVxPeIdP+1mn9DOSIVtNNFgjnEUdEnWU+FSoM7A="; + sha256 = "sha256-HeqsyAmqCUZ1htTv0tHywqYl3ZZBklTU37qaPV++vhU="; }; propagatedBuildInputs = [ From da0ae5e221930495865178ade7940b026163cf4c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Aug 2021 00:15:33 +0200 Subject: [PATCH 215/239] python3Packages.crytic-compile: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/crytic-compile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 6c496185e341da785af6983fdddc6c1dd7d576a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Aug 2021 00:15:42 +0200 Subject: [PATCH 216/239] python3Packages.slither-analyzer: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/slither-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 11497605b41138a78b4d63cb2fb9d7422d993217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 16 Aug 2021 18:17:29 -0400 Subject: [PATCH 217/239] cmark: fix libcmark.pc paths --- pkgs/development/libraries/cmark/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 93bc973d4127..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 = [ From 1c8fa088197bfba0664c2af7576cdea7709432f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Aug 2021 00:40:00 +0200 Subject: [PATCH 218/239] python3Packages.pyvicare: 2.6 -> 2.7 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 6353f88074409cc53c5cc1ea2021d4b69445efd2 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 16 Aug 2021 15:24:02 +0800 Subject: [PATCH 219/239] rust-analyzer: 2021-08-09 -> 2021-08-16 Note that upstream replaced `rollup` with `esbuild` now. --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- pkgs/development/tools/rust/rust-analyzer/update.sh | 6 ++---- .../rust-analyzer/build-deps/package.json | 7 +++---- pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 5 +++-- 4 files changed, 11 insertions(+), 13 deletions(-) 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/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 = '' From ebdc6e2aa9445b9cec42ef8b19e25d1cc07ec476 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 17 Aug 2021 02:56:00 +0800 Subject: [PATCH 220/239] nodePackages: update --- .../node-packages/node-packages.nix | 706 +++++++++++++----- 1 file changed, 537 insertions(+), 169 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3d3a88e2dcda..7190f3942669 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2866,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"; @@ -4081,13 +4090,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.2.8" = { + "@netlify/build-18.2.9" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.2.8"; + version = "18.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.8.tgz"; - sha512 = "fgLzpoTR/PgS3iRWNlxVuGc9OI7PYpiFyVQtPS+eL+1OS1pvilbqVusD7XbZ3AUSNMsKzOPqaUE+LXi5EwFKkA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.2.9.tgz"; + sha512 = "0resO0G+O8SKcQ7UGUeYmrZCL1qeki+cWo47lOQduo4RNjHNH6fS2HSLM0CJEwTKw9SNiJNBb7hZbRi7C/KNdQ=="; }; }; "@netlify/cache-utils-2.0.1" = { @@ -4099,13 +4108,13 @@ let sha512 = "fAw8rMnl14f9TZmKV1g8+/8yVriitfNf4KcdfGPpGLpmQtpnSiynbzhpOLBHsLtViBCJ8O1vy24LK6CJx9JoqA=="; }; }; - "@netlify/config-15.3.1" = { + "@netlify/config-15.3.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.3.1"; + version = "15.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.1.tgz"; - sha512 = "XbPMPHMVN3IHF/KOOJYLvWw84u6F63bpMwt5V4UvObGMAxqosSHElZYl8/Nj4VeplLOwgikT/us50i+EHr7GxA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.3.3.tgz"; + sha512 = "etpctdQCHE/ALOYSWbyXzsquUSswWeUaqMIXfJsJ9pytMmB4oHjB6eu/GIT8FY1R0E6A/aVS2ibeVVexObNXbQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4540,13 +4549,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" = { @@ -5404,15 +5413,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 +5449,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"; @@ -7924,13 +7915,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" = { @@ -7942,13 +7933,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" = { @@ -7960,22 +7951,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" = { @@ -7987,13 +7978,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" = { @@ -8005,13 +7996,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" = { @@ -8023,13 +8014,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" = { @@ -19392,6 +19383,15 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; + "d3-7.0.0" = { + name = "d3"; + packageName = "d3"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3/-/d3-7.0.0.tgz"; + sha512 = "t+jEKGO2jQiSBLJYYq6RFc500tsCeXBB4x41oQaSnZD3Som95nQrlw9XJGrFTMUOQOkwSMauWy9+8Tz1qm9UZw=="; + }; + }; "d3-array-1.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -19410,6 +19410,15 @@ let sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; }; + "d3-array-3.0.1" = { + name = "d3-array"; + packageName = "d3-array"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.1.tgz"; + sha512 = "l3Bh5o8RSoC3SBm5ix6ogaFW+J6rOUm42yOtZ2sQPCEvCqUMepeX7zgrlLLGIemxgOyo9s2CsWEidnLv5PwwRw=="; + }; + }; "d3-axis-1.0.12" = { name = "d3-axis"; packageName = "d3-axis"; @@ -19419,6 +19428,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"; @@ -19428,6 +19446,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"; @@ -19437,6 +19464,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"; @@ -19464,6 +19500,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"; @@ -19473,6 +19518,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"; @@ -19482,6 +19536,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"; @@ -19500,6 +19563,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"; @@ -19509,6 +19581,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"; @@ -19527,6 +19617,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"; @@ -19536,6 +19635,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"; @@ -19545,6 +19662,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"; @@ -19563,6 +19689,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"; @@ -19581,6 +19716,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"; @@ -19599,6 +19743,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"; @@ -19608,6 +19761,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"; @@ -19626,6 +19788,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"; @@ -19644,6 +19815,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"; @@ -19662,6 +19842,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"; @@ -19671,6 +19860,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"; @@ -19689,6 +19887,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"; @@ -19698,6 +19905,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"; @@ -19716,6 +19932,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"; @@ -19725,6 +19950,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"; @@ -19734,6 +19968,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"; @@ -19752,6 +20004,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"; @@ -19770,6 +20031,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"; @@ -19788,6 +20058,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"; @@ -19806,6 +20085,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"; @@ -19815,6 +20103,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"; @@ -19833,6 +20139,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"; @@ -20904,6 +21228,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"; @@ -31546,6 +31879,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"; @@ -39503,13 +39845,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" = { @@ -41808,22 +42150,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-11.0.1" = { + "netlify-redirect-parser-11.0.2" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.1.tgz"; - sha512 = "CSIff1lGEA9dn86pnHfsAPei3wr1LfE+vv+XwWO3wStd7kQ1my2bgUxttFBEJDK5YdW+sb7v1285HKm48XZhhw=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-11.0.2.tgz"; + sha512 = "ngGSxRUv8dsao586J0MsfQFpi66TnIlYND1KRl1vCgjuuMBzvO9WbV8maqJA9d0G6f9NVKb+LqufmOQj4AkkFw=="; }; }; "netlify-redirector-0.2.1" = { @@ -47922,15 +48264,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"; @@ -53070,6 +53403,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"; @@ -53079,15 +53421,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"; @@ -55374,13 +55707,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" = { @@ -64178,13 +64511,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" = { @@ -74490,7 +74823,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" ]; @@ -76367,10 +76700,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" @@ -85536,7 +85869,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" // { @@ -92819,7 +93152,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" @@ -93487,7 +93820,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" @@ -95114,7 +95447,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" @@ -99811,7 +100144,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" @@ -100155,7 +100488,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" @@ -101031,10 +101364,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.4.0"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.0.tgz"; - sha512 = "x68Mpn5UkknbHa5Rl4BChZkg47wlAQpwDAkoeFLlnyr7Xjn5zPE0dEu5eGQtcGgBHIgaJJNZhYNOD/H+EWfk3A=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.4.2.tgz"; + sha512 = "3w4D4AG3j0+diPu284sWPenkyTIjZ/j0M3DQ+MU6Vp3298fV/yncpC0taAPk/7NxqAH90Z+iWpdvoO9IUahzzA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101169,10 +101502,14 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.2.8" // { + (sources."@netlify/build-18.2.9" // { dependencies = [ sources."is-plain-obj-2.1.0" - sources."locate-path-5.0.0" + (sources."locate-path-5.0.0" // { + dependencies = [ + sources."p-locate-4.1.0" + ]; + }) sources."resolve-2.0.0-next.3" ]; }) @@ -101180,23 +101517,19 @@ in dependencies = [ sources."del-5.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."slash-3.0.0" ]; }) - (sources."@netlify/config-15.3.1" // { + (sources."@netlify/config-15.3.3" // { 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.8.0" sources."@netlify/functions-utils-2.0.2" (sources."@netlify/git-utils-2.0.1" // { dependencies = [ @@ -101290,7 +101623,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" @@ -101419,8 +101752,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-13.0.12" 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" @@ -101437,7 +101770,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" @@ -102296,12 +102629,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" @@ -102420,8 +102748,8 @@ in sources."qs-6.10.1" ]; }) - sources."netlify-headers-parser-2.1.1" - sources."netlify-redirect-parser-11.0.1" + 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" @@ -102544,7 +102872,11 @@ 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-locate-5.0.0" // { + dependencies = [ + sources."p-limit-3.1.0" + ]; + }) sources."p-map-4.0.0" sources."p-reduce-2.1.0" sources."p-timeout-2.0.1" @@ -102592,6 +102924,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" ]; }) sources."posix-character-classes-0.1.1" @@ -102608,7 +102941,7 @@ in sources."color-name-1.1.3" ]; }) - 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" @@ -102641,6 +102974,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" sources."type-fest-0.8.1" ]; }) @@ -103007,6 +103341,7 @@ in dependencies = [ sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."p-locate-4.1.0" ]; }) sources."yargs-parser-18.1.3" @@ -111416,7 +111751,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" @@ -111432,35 +111767,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" @@ -111487,7 +111814,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" @@ -111508,18 +111834,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.0" + sources."d3-array-3.0.1" + 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" @@ -111532,6 +111903,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" @@ -111572,7 +111944,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" @@ -111611,20 +111982,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" @@ -111643,7 +112013,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" @@ -111698,7 +112067,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" @@ -111720,13 +112088,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" @@ -111742,7 +112111,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" // { @@ -113613,10 +113981,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.682.0"; + version = "1.683.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.682.0.tgz"; - sha512 = "tJqDDtHZaSONwURXcs0Itui+0PSFN9te31/+OSpGcyJl4DutDHPcoEyek50bwQcny4yy44s80KW1hFpeOozLZQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.683.0.tgz"; + sha512 = "cvdSuSuHyb7ijF68afG/Nbxm4wxnPQQCMjB0SYqTln+W7tMY8wLUr86QaQZIBN2Umb7zgY40gBRDq2R2nYVZGQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -114173,7 +114541,7 @@ in 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" @@ -120952,7 +121320,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" ]; @@ -121050,7 +121418,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" @@ -124691,7 +125059,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" From 50dd4a6cb2c8003d995459db7c9e8d8eee59cc08 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 22:09:48 +0200 Subject: [PATCH 221/239] beam-modules: deprecate phases --- pkgs/development/beam-modules/fetch-hex.nix | 11 ++++++----- .../beam-modules/fetch-rebar-deps.nix | 16 +++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 7f84e2360704..35e5036076ff 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -1,21 +1,22 @@ { 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; 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..0cf2c4c6cb0b 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,27 +1,33 @@ { 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; - 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"; From 5919a4254607dd6a08c964aaaf0a180c6cd6214d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 17 Aug 2021 01:30:42 +0000 Subject: [PATCH 222/239] drawpile,drawpile-server-headless: 2.1.17 -> 2.1.19 (#134331) --- pkgs/applications/graphics/drawpile/default.nix | 12 ++---------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d6d2b4248ee..7bcce0f3053d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23953,8 +23953,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; }; From 565db308762cc1f5fc6df155e0981327b229acec Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 16 Aug 2021 18:52:22 -0700 Subject: [PATCH 223/239] pkgsStatic: fix musleabi* adapter Fixes pkgsCross.muslpi.nix (depends on pkgsCross.muslpi.busybox-sandbox-shell, which depends on pkgsCross.muslpi.pkgsStatic.stdenv) Currently, the ABI adapter in pkgsStatic does not recognize musleabi/musleabihf and falls back to "musl". ``` > nix eval -f . pkgsCross.muslpi.stdenv.hostPlatform.config "armv6l-unknown-linux-musleabihf" > nix eval -f . pkgsCross.muslpi.pkgsStatic.stdenv.hostPlatform.config "armv6l-unknown-linux-musl" ``` This results in an invalid config passed to GCC configuration, which fails with `Configuration armv6l-unknown-linux-musl not supported`. --- pkgs/top-level/stage.nix | 2 ++ 1 file changed, 2 insertions(+) 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; }; From 00037f740333a18292326e9fd5c0163c91fe41de Mon Sep 17 00:00:00 2001 From: Jasper <39903+jbg@users.noreply.github.com> Date: Tue, 17 Aug 2021 09:12:51 +0700 Subject: [PATCH 224/239] darwin.binutils: fix wrapper of `as` when cross-compiling to aarch64-darwin (#134097) --- pkgs/os-specific/darwin/binutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" ''; From 7364241a6a060a9180c0b77ac5f627af0d80837c Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 16 Aug 2021 19:42:10 -0700 Subject: [PATCH 225/239] gcc: update powerpc-specific configuration * support -m32 on (big-endian) powerpc64-linux * fix compilation to powerpc*-musl targets with incomplete decimal-float support --- pkgs/development/compilers/gcc/common/configure-flags.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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}" From 5e2ef472932615c52440f9be3b956f57eaf389bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 03:28:00 +0000 Subject: [PATCH 226/239] disfetch: 2.10 -> 2.12 --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From b1868a829689c8da19b79f6c023dc04bbdc6887c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 03:53:13 +0000 Subject: [PATCH 227/239] elan: 1.0.6 -> 1.0.7 --- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From 17a9d5926cefda015270cf4afb94df43d4672b56 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 13 Aug 2021 00:59:54 +1000 Subject: [PATCH 228/239] coreutils: disable tests on armv7l --- pkgs/tools/misc/coreutils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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"; From e701bc3bfbc82e3e6bd3321c3999a085cb6fba1c Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 17 Aug 2021 08:51:27 +0200 Subject: [PATCH 229/239] nixos-generators: 1.3.0 -> 1.4.0 --- pkgs/tools/nix/nixos-generators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)" ]; From a1fdebcef0befd3c81955e5a3d11292a819f84fc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Aug 2021 12:15:24 +0200 Subject: [PATCH 230/239] chromium: Document the main gn build flags --- .../networking/browsers/chromium/common.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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. From 1c476a2b6dda4bef88270f0285cac5363712c980 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 17 Aug 2021 10:24:52 +0200 Subject: [PATCH 231/239] chromium: 92.0.4515.131 -> 92.0.4515.159 https://chromereleases.googleblog.com/2021/08/stable-channel-update-for-desktop.html This update includes 9 security fixes. CVEs: CVE-2021-30598 CVE-2021-30599 CVE-2021-30600 CVE-2021-30601 CVE-2021-30602 CVE-2021-30603 CVE-2021-30604 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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", From aa4e76dfb90966409e6e7bb84db124857c8ed3b3 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 17 Aug 2021 08:12:11 +0530 Subject: [PATCH 232/239] catgirl: 1.9 -> 1.9a --- .../applications/networking/irc/catgirl/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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; From 7f37347f5eb6fab3cca0cc25454b741d8f73be8f Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 17 Aug 2021 12:05:11 +0900 Subject: [PATCH 233/239] fetch-hex: deprecate phases fix --- pkgs/development/beam-modules/fetch-hex.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 35e5036076ff..9c2ed1ea22b6 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -11,6 +11,9 @@ with lib; stdenv.mkDerivation ({ pname = "hex-source-${pkg}"; inherit version; + dontBuild = true; + dontConfigure = true; + dontFixup = true; src = fetchurl { url = "https://repo.hex.pm/tarballs/${pkg}-${version}.tar"; From ec6dee00ecfe25065e658f35eee78ad517b8a605 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 17 Aug 2021 12:05:49 +0900 Subject: [PATCH 234/239] fetch-rebar-deps: phases deprecation fix --- pkgs/development/beam-modules/fetch-rebar-deps.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index 0cf2c4c6cb0b..31bef024d320 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation ({ inherit version; dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; prePhases = '' cp ${src} . From c6f73e4badf4429e9f25340db3c86ea7acf1c4a5 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 16 Aug 2021 18:10:18 +1000 Subject: [PATCH 235/239] samba: fix build hanging on armv7l configure phase --- pkgs/servers/samba/4.x.nix | 3 +++ 1 file changed, 3 insertions(+) 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. From c40a9d125c69e60cb9c401f04847f4e57de670f1 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 13 Aug 2021 01:00:15 +1000 Subject: [PATCH 236/239] libopus: disable tests on armv7l --- pkgs/development/libraries/libopus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; From 22719ca7de0b005426aae093e85e4abe91318fe6 Mon Sep 17 00:00:00 2001 From: Martin Minka Date: Sun, 13 Dec 2020 23:14:56 +0100 Subject: [PATCH 237/239] nixos/caddy: add resume option Without this option all changes done with Caddy API are lost after reboot. Current service is not supporting Caddy --resume parameter. There is reference to original unit https://github.com/caddyserver/dist/blob/master/init/caddy.service which also mentions --resume and that it should be used if new Caddy API will be used. --- nixos/modules/services/web-servers/caddy.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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; From 75ab21bf877c81c7bbe664201aed4680a76d2ad9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 06:30:21 +0000 Subject: [PATCH 238/239] headscale: 0.6.0 -> 0.6.1 --- pkgs/servers/headscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From c6ef93153307bfa77e5609718b9e50d0806b0095 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 10:09:44 +0000 Subject: [PATCH 239/239] notejot: 3.0.4 -> 3.1.0 --- pkgs/applications/misc/notejot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [